From 68729cc68abc0c8088868b6426cd8334af7a4cc5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 11 Jun 2018 14:15:46 +0200
Subject: [PATCH] [Cache] Fix expiry comparisons in array-based pools

---
 src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php | 2 +-
 src/Symfony/Component/Cache/Traits/ArrayTrait.php         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php b/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php
index 1a6157e822117..7cdcafd8e5453 100644
--- 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
index b7d2ad6d6299c..88385ed480f34 100644
--- 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];