[Cache] fix versioning with SimpleCacheAdapter

nicolas-grekas · nicolas-grekas · commit 02a6f248b504 · 2019-06-17T19:18:24.000+02:00
diff --git a/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php b/src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php
@@ -78,6 +78,8 @@ protected function doSave(array $values, $lifetime)
 
     /**
      * @return string the namespace separator for cache keys
+     *
+     * @internal
      */
     protected static function getNsSeparator()
     {
diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
@@ -108,7 +108,7 @@ public function clear()
         if ($cleared = $this->versioningIsEnabled) {
             $namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), static::getNsSeparator(), 5);
             try {
-                $cleared = $this->doSave(['@'.$this->namespace => $namespaceVersion], 0);
+                $cleared = $this->doSave([static::getNsSeparator().$this->namespace => $namespaceVersion], 0);
             } catch (\Exception $e) {
                 $cleared = false;
             }
@@ -237,12 +237,12 @@ private function getId($key)
         if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
             $this->namespaceVersion = '1'.static::getNsSeparator();
             try {
-                foreach ($this->doFetch(['@'.$this->namespace]) as $v) {
+                foreach ($this->doFetch([static::getNsSeparator().$this->namespace]) as $v) {
                     $this->namespaceVersion = $v;
                 }
                 if ('1'.static::getNsSeparator() === $this->namespaceVersion) {
                     $this->namespaceVersion = substr_replace(base64_encode(pack('V', time())), static::getNsSeparator(), 5);
-                    $this->doSave(['@'.$this->namespace => $this->namespaceVersion], 0);
+                    $this->doSave([static::getNsSeparator().$this->namespace => $this->namespaceVersion], 0);
                 }
             } catch (\Exception $e) {
             }
@@ -268,6 +268,8 @@ public static function handleUnserializeCallback($class)
 
     /**
      * @return string the namespace separator for cache keys
+     *
+     * @internal
      */
     protected static function getNsSeparator()
     {

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ protected function doSave(array $values, $lifetime)`
`78`	`78`
`79`	`79`	`/**`
`80`	`80`	`* @return string the namespace separator for cache keys`
	`81`	`+ *`
	`82`	`+ * @internal`
`81`	`83`	`*/`
`82`	`84`	`protected static function getNsSeparator()`
`83`	`85`	`{`