diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.1' 

* 5.1:
  [Cache] fix merge
This commit is contained in:
Nicolas Grekas 2020-07-13 11:17:24 +02:00
parent d8338dc358 85da081614
commit ba4d57bb5f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
View File

@ -205,7 +205,7 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
return false;
}
if (null === $expiry && 0 < $this->defaultLifetime) {
$expiry = microtime(true) + $this->defaultLifetime;
$expiry = $this->defaultLifetime;
$expiry = $now + ($expiry > ($this->maxLifetime ?: $expiry) ? $this->maxLifetime : $expiry);
} elseif ($this->maxLifetime && (null === $expiry || $expiry > $now + $this->maxLifetime)) {
$expiry = $now + $this->maxLifetime;