Merge branch 'hotfix/5597' into develop

Forward port zendframework/zendframework#5597
zendframework · Mar 3, 2014 · 5aac226 · 5aac226
commit 5aac226
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/Storage/Adapter/AbstractZendServer.php b/src/Storage/Adapter/AbstractZendServer.php
@@ -39,9 +39,8 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
         $prefix      = ($namespace === '') ? '' : $namespace . self::NAMESPACE_SEPARATOR;
 
         $result = $this->zdcFetch($prefix . $normalizedKey);
-        if ($result === false) {
+        if ($result === null) {
             $success = false;
-            $result  = null;
         } else {
             $success  = true;
             $casToken = $result;

diff --git a/src/Storage/Adapter/ZendServerDisk.php b/src/Storage/Adapter/ZendServerDisk.php
@@ -149,7 +149,7 @@ protected function zdcStore($internalKey, $value, $ttl)
      * Fetch a single item from Zend Data Disk Cache
      *
      * @param  string $internalKey
-     * @return mixed The stored value or FALSE if item wasn't found
+     * @return mixed The stored value or NULL if item wasn't found
      * @throws Exception\RuntimeException
      */
     protected function zdcFetch($internalKey)

diff --git a/src/Storage/Adapter/ZendServerShm.php b/src/Storage/Adapter/ZendServerShm.php
@@ -104,7 +104,7 @@ protected function zdcStore($internalKey, $value, $ttl)
      * Fetch a single item from Zend Data SHM Cache
      *
      * @param  string $internalKey
-     * @return mixed The stored value or FALSE if item wasn't found
+     * @return mixed The stored value or NULL if item wasn't found
      * @throws Exception\RuntimeException
      */
     protected function zdcFetch($internalKey)

diff --git a/test/Storage/Adapter/AbstractZendServerTest.php b/test/Storage/Adapter/AbstractZendServerTest.php
@@ -51,6 +51,20 @@ public function testGetItem()
         $this->assertEquals('value', $this->_storage->getItem('key'));
     }
 
+    public function testGetItemFailed()
+    {
+        $success = null;
+        $this->_options->setNamespace('ns');
+
+        $this->_storage->expects($this->once())
+                       ->method('zdcFetch')
+                       ->with($this->equalTo('ns' . AbstractZendServer::NAMESPACE_SEPARATOR . 'key'))
+                       ->will($this->returnValue(null));
+
+        $this->assertNull($this->_storage->getItem('key', $success));
+        $this->assertFalse($success);
+    }
+
     public function testGetMetadata()
     {
         $this->_options->setNamespace('ns');