Merge branch 'hotfix/zendframework/zendframework#7032-fix-undefined-v…

…ariable-in-cache-apc-storage' into develop Close zendframework/zendframework#7032 Close zendframework/zendframework#7031
zendframework · Dec 16, 2014 · d7f5f57 · d7f5f57
4 parents 6313fe3 + 1ec6c6d + babe345 + 596ae2c
commit d7f5f57
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Storage/Adapter/Apc.php b/src/Storage/Adapter/Apc.php
@@ -361,24 +361,27 @@ protected function internalGetMetadatas(array & $normalizedKeys)
 
         $options   = $this->getOptions();
         $namespace = $options->getNamespace();
+        $prefixL   = 0;
+
         if ($namespace === '') {
             $pattern = '/^(' . implode('|', $keysRegExp) . ')' . '$/';
         } else {
             $prefix  = $namespace . $options->getNamespaceSeparator();
+            $prefixL = strlen($prefix);
             $pattern = '/^' . preg_quote($prefix, '/') . '(' . implode('|', $keysRegExp) . ')' . '$/';
         }
+
         $format  = APC_ITER_ALL ^ APC_ITER_VALUE ^ APC_ITER_TYPE ^ APC_ITER_REFCOUNT;
         $it      = new BaseApcIterator('user', $pattern, $format, 100, APC_LIST_ACTIVE);
         $result  = array();
-        $prefixL = strlen($prefix);
         foreach ($it as $internalKey => $metadata) {
             // @see http://pecl.php.net/bugs/bug.php?id=22564
             if (!apc_exists($internalKey)) {
                 continue;
             }
 
             $this->normalizeMetadata($metadata);
-            $result[substr($internalKey, $prefixL)] = & $metadata;
+            $result[substr($internalKey, $prefixL)] = $metadata;
         }
 
         return $result;

diff --git a/test/Storage/Adapter/CommonAdapterTest.php b/test/Storage/Adapter/CommonAdapterTest.php
@@ -377,7 +377,7 @@ public function testGetMetadataReturnsFalseIfNonReadable()
 
     public function testGetMetadatas()
     {
-        $capabilities = $this->_storage->getCapabilities();
+        $capabilities       = $this->_storage->getCapabilities();
         $supportedMetadatas = $capabilities->getSupportedMetadata();
 
         $items = array(
@@ -397,6 +397,16 @@ public function testGetMetadatas()
         }
     }
 
+    /**
+     * @group 7031
+     * @group 7032
+     */
+    public function testGetMetadatasWithEmptyNamespace()
+    {
+        $this->_options->setNamespace('');
+        $this->testGetMetadatas();
+    }
+
     public function testGetMetadatasReturnsEmptyArrayIfNonReadable()
     {
         $this->_options->setReadable(false);