[Cache] Restrict flushes to namespace scopes

nicolas-grekas · nicolas-grekas · commit ad21a8c50bd9 · 2016-03-15T13:30:52.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -50,7 +50,9 @@ protected function doHave($id)
      */
     protected function doClear($namespace)
     {
-        return apcu_clear_cache();
+        return isset($namespace[0]) && class_exists('APCuIterator', false)
+            ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/'))))
+            : apcu_clear_cache();
     }
 
     /**
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php
@@ -22,8 +22,9 @@ class DoctrineAdapter extends AbstractAdapter
 
     public function __construct(CacheProvider $provider, $defaultLifetime = 0, $namespace = '')
     {
-        parent::__construct($namespace, $defaultLifetime);
+        parent::__construct('', $defaultLifetime);
         $this->provider = $provider;
+        $provider->setNamespace($namespace);
     }
 
     /**
@@ -47,7 +48,11 @@ protected function doHave($id)
      */
     protected function doClear($namespace)
     {
-        return $this->provider->flushAll();
+        $namespace = $this->provider->getNamespace();
+
+        return isset($namespace[0])
+            ? $this->provider->deleteAll()
+            : $this->provider->flushAll();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ protected function doHave($id)`
`50`	`50`	`*/`
`51`	`51`	`protected function doClear($namespace)`
`52`	`52`	`{`
`53`		`- return apcu_clear_cache();`
	`53`	`+ return isset($namespace[0]) && class_exists('APCuIterator', false)`
	`54`	`+ ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/'))))`
	`55`	`+ : apcu_clear_cache();`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,9 @@ class DoctrineAdapter extends AbstractAdapter`
`22`	`22`
`23`	`23`	`public function __construct(CacheProvider $provider, $defaultLifetime = 0, $namespace = '')`
`24`	`24`	`{`
`25`		`- parent::__construct($namespace, $defaultLifetime);`
	`25`	`+ parent::__construct('', $defaultLifetime);`
`26`	`26`	`$this->provider = $provider;`
	`27`	`+ $provider->setNamespace($namespace);`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`/**`
`@@ -47,7 +48,11 @@ protected function doHave($id)`
`47`	`48`	`*/`
`48`	`49`	`protected function doClear($namespace)`
`49`	`50`	`{`
`50`		`- return $this->provider->flushAll();`
	`51`	`+ $namespace = $this->provider->getNamespace();`
	`52`	`+`
	`53`	`+ return isset($namespace[0])`
	`54`	`+ ? $this->provider->deleteAll()`
	`55`	`+ : $this->provider->flushAll();`
`51`	`56`	`}`
`52`	`57`
`53`	`58`	`/**`