bug #27576 [Cache] Fix expiry comparisons in array-based pools (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit e564c70772fd · 2018-06-11T16:08:45.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Cache] Fix expiry comparisons in array-based pools | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 68729cc [Cache] Fix expiry comparisons in array-based pools
diff --git a/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php b/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php
@@ -21,7 +21,7 @@ protected function doContains($id)
 
         $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)
diff --git a/src/Symfony/Component/Cache/Traits/ArrayTrait.php b/src/Symfony/Component/Cache/Traits/ArrayTrait.php
@@ -44,7 +44,7 @@ public function hasItem($key)
     {
         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 @@ private function generateItems(array $keys, $now, $f)
     {
         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];

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ protected function doContains($id)`
`21`	`21`
`22`	`22`	`$expiry = $this->data[$id][1];`
`23`	`23`
`24`		`- return !$expiry \|\| time() <= $expiry \|\| !$this->doDelete($id);`
	`24`	`+ return !$expiry \|\| time() < $expiry \|\| !$this->doDelete($id);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`protected function doSave($id, $data, $lifeTime = 0)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function hasItem($key)`
`44`	`44`	`{`
`45`	`45`	`CacheItem::validateKey($key);`
`46`	`46`
`47`		`- return isset($this->expiries[$key]) && ($this->expiries[$key] >= time() \|\| !$this->deleteItem($key));`
	`47`	`+ return isset($this->expiries[$key]) && ($this->expiries[$key] > time() \|\| !$this->deleteItem($key));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`@@ -81,7 +81,7 @@ private function generateItems(array $keys, $now, $f)`
`81`	`81`	`{`
`82`	`82`	`foreach ($keys as $i => $key) {`
`83`	`83`	`try {`
`84`		`- if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= $now \|\| !$this->deleteItem($key))) {`
	`84`	`+ if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now \|\| !$this->deleteItem($key))) {`
`85`	`85`	`$this->values[$key] = $value = null;`
`86`	`86`	`} elseif (!$this->storeSerialized) {`
`87`	`87`	`$value = $this->values[$key];`