Merge branch 'cache-get-item-fix' of github.com:hver/zf2 into hver-ca…

…che-get-item-fix
zendframework · Aug 27, 2014 · 2a9c590 · 2a9c590
2 parents 766fd11 + f88b774
commit 2a9c590
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php b/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
@@ -370,7 +370,8 @@ public function getItem($key, & $success = null, & $casToken = null)
             }
             return $this->triggerPost(__FUNCTION__, $args, $result);
         } catch (\Exception $e) {
-            $result = false;
+            $result = null;
+            $success = false;
             return $this->triggerException(__FUNCTION__, $args, $result, $e);
         }
     }

diff --git a/tests/ZendTest/Cache/Storage/Adapter/AbstractAdapterTest.php b/tests/ZendTest/Cache/Storage/Adapter/AbstractAdapterTest.php
@@ -356,6 +356,32 @@ public function testGetMetadataCallsInternalGetMetadata()
         $this->assertSame($result, $rs);
     }
 
+    public function testGetItemReturnsNullIfFailed()
+    {
+        $this->_storage = $this->getMockForAbstractAdapter(array('internalGetItem'));
+
+        $key    = 'key1';
+
+        // Do not throw exceptions outside the adapter
+        $pluginOptions = new Cache\Storage\Plugin\PluginOptions(
+            array('throw_exceptions' => false)
+        );
+        $plugin = new Cache\Storage\Plugin\ExceptionHandler();
+        $plugin->setOptions($pluginOptions);
+        $this->_storage->addPlugin($plugin);
+
+        // Simulate internalGetItem() throwing an exception
+        $this->_storage
+            ->expects($this->once())
+            ->method('internalGetItem')
+            ->with($this->equalTo($key))
+            ->will($this->throwException(new \Exception('internalGet failed')));
+
+        $result = $this->_storage->getItem($key, $success);
+        $this->assertNull($result, 'GetItem should return null the item cannot be retrieved');
+        $this->assertFalse($success, '$success should be false if the item cannot be retrieved');
+    }
+
 /*
     public function testGetMetadatas()
     {