[Cache] Fix expiry comparisons in array-based pools
This commit is contained in:
parent
873abdad12
commit
68729cc68a
@ -21,7 +21,7 @@ class ArrayCache extends CacheProvider
|
||||
|
||||
$expiry = $this->data[$id][1];
|
||||
|
||||
return !$expiry || time() <= $expiry || !$this->doDelete($id);
|
||||
return !$expiry || time() < $expiry || !$this->doDelete($id);
|
||||
}
|
||||
|
||||
protected function doSave($id, $data, $lifeTime = 0)
|
||||
|
@ -44,7 +44,7 @@ trait ArrayTrait
|
||||
{
|
||||
CacheItem::validateKey($key);
|
||||
|
||||
return isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key));
|
||||
return isset($this->expiries[$key]) && ($this->expiries[$key] > time() || !$this->deleteItem($key));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -81,7 +81,7 @@ trait ArrayTrait
|
||||
{
|
||||
foreach ($keys as $i => $key) {
|
||||
try {
|
||||
if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= $now || !$this->deleteItem($key))) {
|
||||
if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now || !$this->deleteItem($key))) {
|
||||
$this->values[$key] = $value = null;
|
||||
} elseif (!$this->storeSerialized) {
|
||||
$value = $this->values[$key];
|
||||
|
Reference in New Issue
Block a user