Merge pull request zendframework/zendframework#7039 from marc-mabe/ho…

…tfix/5860_5863 Cache: better fix for zendframework/zendframework#5860 introduced in zendframework/zendframework#5863
zendframework · Jan 1, 2015 · da594a3 · da594a3
2 parents 362644d + d3b89d4
commit da594a3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/Pattern/PatternOptions.php b/src/Pattern/PatternOptions.php
@@ -574,7 +574,7 @@ public function getObjectCacheMethods()
      * Used by:
      * - ObjectCache
      *
-     * @param  mixed $objectKey
+     * @param  null|string $objectKey The object key or NULL to use the objects class name
      * @return PatternOptions
      */
     public function setObjectKey($objectKey)
@@ -597,7 +597,7 @@ public function setObjectKey($objectKey)
      */
     public function getObjectKey()
     {
-        if (!$this->objectKey) {
+        if ($this->objectKey === null) {
             return get_class($this->getObject());
         }
         return $this->objectKey;

diff --git a/src/Storage/Plugin/PluginOptions.php b/src/Storage/Plugin/PluginOptions.php
@@ -26,7 +26,7 @@ class PluginOptions extends AbstractOptions
     /**
      * Used by:
      * - ExceptionHandler
-     * @var callable
+     * @var null|callable
      */
     protected $exceptionCallback;
 
@@ -99,7 +99,7 @@ public function getClearingFactor()
      * Used by:
      * - ExceptionHandler
      *
-     * @param  callable $exceptionCallback
+     * @param  null|callable $exceptionCallback
      * @throws Exception\InvalidArgumentException
      * @return PluginOptions
      */
@@ -118,7 +118,7 @@ public function setExceptionCallback($exceptionCallback)
      * Used by:
      * - ExceptionHandler
      *
-     * @return callable
+     * @return null|callable
      */
     public function getExceptionCallback()
     {

diff --git a/test/Pattern/ObjectCacheTest.php b/test/Pattern/ObjectCacheTest.php
@@ -134,6 +134,21 @@ public function testUnsetProperty()
         $this->assertFalse(isset($this->_pattern->property));
     }
 
+    /**
+     * @group 7039
+     */
+    public function testEmptyObjectKeys()
+    {
+        $this->_options->setObjectKey('0');
+        $this->assertSame('0', $this->_options->getObjectKey(), "Can't set string '0' as object key");
+
+        $this->_options->setObjectKey('');
+        $this->assertSame('', $this->_options->getObjectKey(), "Can't set an empty string as object key");
+
+        $this->_options->setObjectKey(null);
+        $this->assertSame(get_class($this->_options->getObject()), $this->_options->getObjectKey());
+    }
+
     protected function _testCall($method, array $args)
     {
         $returnSpec = 'foobar_return(' . implode(', ', $args) . ') : ';