Confusion possible if overriding private method.

pydio · Apr 26, 2016 · eb5f974 · eb5f974
1 parent 4c6869a
commit eb5f974
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/src/plugins/cache.doctrine/ext/PydioApcuCache.php b/core/src/plugins/cache.doctrine/ext/PydioApcuCache.php
@@ -35,7 +35,7 @@ class PydioApcuCache extends \Doctrine\Common\Cache\ApcuCache implements Pattern
      *
      * @return string The namespaced id.
      */
-    private function getNamespacedId($id)
+    private function namespacedIdAsPattern($id)
     {
         return sprintf('%s\['.preg_quote($id, "/"), $this->internalNamespace);
     }
@@ -46,11 +46,11 @@ private function getNamespacedId($id)
      */
     public function deleteKeysStartingWith($pattern)
     {
-        $pattern = '/^'.$this->getNamespacedId($pattern).'/';
+        $pattern = '/^'.$this->namespacedIdAsPattern($pattern).'/';
         //SAMPLE /^pydio-unique-id_nodes_\[list\:\/\/1/
         $iterator = new APCIterator('user', $pattern);
         foreach ($iterator as $data) {
-            $res = $this->doDelete($data['key']);
+            $this->doDelete($data['key']);
         }
     }
 

diff --git a/core/src/plugins/cache.doctrine/ext/PydioRedisCache.php b/core/src/plugins/cache.doctrine/ext/PydioRedisCache.php
@@ -47,7 +47,7 @@ public function setRedis($redis){
      *
      * @return string The namespaced id.
      */
-    private function getNamespacedId($id)
+    private function namespacedIdAsPattern($id)
     {
         // Escape redis MATCH special characters
         $id = str_replace(array("?", "*", "[", "]", "^", "-"), array("\?", "\*", "\[", "\]", "\^", "\-"), $id);
@@ -61,7 +61,7 @@ private function getNamespacedId($id)
      */
     public function deleteKeysStartingWith($pattern)
     {
-        $pattern = $this->getNamespacedId($pattern);
+        $pattern = $this->namespacedIdAsPattern($pattern);
         $it = NULL; /* Initialize our iterator to NULL */
         $this->internalRedis->setOption(Redis::OPT_SCAN, Redis::SCAN_RETRY); /* retry when we get no keys back */
         while($arr_keys = $this->internalRedis->scan($it, $pattern)) {