[Cache] fix merge
This commit is contained in:
parent
c87847c361
commit
85da081614
@ -205,7 +205,7 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (null === $expiry && 0 < $this->defaultLifetime) {
|
if (null === $expiry && 0 < $this->defaultLifetime) {
|
||||||
$expiry = microtime(true) + $this->defaultLifetime;
|
$expiry = $this->defaultLifetime;
|
||||||
$expiry = $now + ($expiry > ($this->maxLifetime ?: $expiry) ? $this->maxLifetime : $expiry);
|
$expiry = $now + ($expiry > ($this->maxLifetime ?: $expiry) ? $this->maxLifetime : $expiry);
|
||||||
} elseif ($this->maxLifetime && (null === $expiry || $expiry > $now + $this->maxLifetime)) {
|
} elseif ($this->maxLifetime && (null === $expiry || $expiry > $now + $this->maxLifetime)) {
|
||||||
$expiry = $now + $this->maxLifetime;
|
$expiry = $now + $this->maxLifetime;
|
||||||
|
Reference in New Issue
Block a user