[Cache] prevent getting older entries when the version key is evicted

nicolas-grekas · nicolas-grekas · commit 00855895a85d · 2018-09-25T09:13:51.000+02:00
diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
@@ -106,14 +106,7 @@ public function clear()
     {
         $this->deferred = array();
         if ($cleared = $this->versioningIsEnabled) {
-            $namespaceVersion = 2;
-            try {
-                foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
-                    $namespaceVersion = 1 + (int) $v;
-                }
-            } catch (\Exception $e) {
-            }
-            $namespaceVersion .= ':';
+            $namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), ':', 5);
             try {
                 $cleared = $this->doSave(array('@'.$this->namespace => $namespaceVersion), 0);
             } catch (\Exception $e) {
@@ -247,6 +240,10 @@ private function getId($key)
                 foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
                     $this->namespaceVersion = $v;
                 }
+                if ('1:' === $this->namespaceVersion) {
+                    $this->namespaceVersion = substr_replace(base64_encode(pack('V', time())), ':', 5);
+                    $this->doSave(array('@'.$this->namespace => $this->namespaceVersion), 0);
+                }
             } catch (\Exception $e) {
             }
         }
