diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Cache] fix versioning with SimpleCacheAdapter

Browse Source
This commit is contained in:
Nicolas Grekas 2019-06-17 19:18:24 +02:00
parent cfc8ac02b3
commit 02a6f248b5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Cache/Adapter/SimpleCacheAdapter.php
View File

@ -78,6 +78,8 @@ class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface
/** /**
* @return string the namespace separator for cache keys * @return string the namespace separator for cache keys
*
* @internal
*/ */
protected static function getNsSeparator() protected static function getNsSeparator()
{ {

8
src/Symfony/Component/Cache/Traits/AbstractTrait.php
View File

@ -108,7 +108,7 @@ trait AbstractTrait
if ($cleared = $this->versioningIsEnabled) { if ($cleared = $this->versioningIsEnabled) {
$namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), static::getNsSeparator(), 5); $namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), static::getNsSeparator(), 5);
try { try {
$cleared = $this->doSave(['@'.$this->namespace => $namespaceVersion], 0); $cleared = $this->doSave([static::getNsSeparator().$this->namespace => $namespaceVersion], 0);
} catch (\Exception $e) { } catch (\Exception $e) {
$cleared = false; $cleared = false;
} }
@ -237,12 +237,12 @@ trait AbstractTrait
if ($this->versioningIsEnabled && '' === $this->namespaceVersion) { if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
$this->namespaceVersion = '1'.static::getNsSeparator(); $this->namespaceVersion = '1'.static::getNsSeparator();
try { try {
foreach ($this->doFetch(['@'.$this->namespace]) as $v) { foreach ($this->doFetch([static::getNsSeparator().$this->namespace]) as $v) {
$this->namespaceVersion = $v; $this->namespaceVersion = $v;
} }
if ('1'.static::getNsSeparator() === $this->namespaceVersion) { if ('1'.static::getNsSeparator() === $this->namespaceVersion) {
$this->namespaceVersion = substr_replace(base64_encode(pack('V', time())), static::getNsSeparator(), 5); $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) { } catch (\Exception $e) {
} }
@ -268,6 +268,8 @@ trait AbstractTrait
/** /**
* @return string the namespace separator for cache keys * @return string the namespace separator for cache keys
*
* @internal
*/ */
protected static function getNsSeparator() protected static function getNsSeparator()
{ {