patch zendframework#5860 : on Cache component

abutme · Mar 17, 2014 · 82493b5 · 82493b5
1 parent 39e71c9
commit 82493b5
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 9 deletions.
diff --git a/library/Zend/Cache/Pattern/AbstractPattern.php b/library/Zend/Cache/Pattern/AbstractPattern.php
@@ -22,7 +22,7 @@ abstract class AbstractPattern implements PatternInterface
     /**
      * Set pattern options
      *
-     * @param  array|Traversable|PatternOptions $options
+     * @param  PatternOptions $options
      * @return AbstractPattern
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Cache/Pattern/CaptureCache.php b/library/Zend/Cache/Pattern/CaptureCache.php
@@ -67,7 +67,7 @@ public function set($content, $pageId = null)
      * Get from cache
      *
      * @param  null|string $pageId
-     * @return bool|string
+     * @return string|null
      * @throws Exception\LogicException
      * @throws Exception\RuntimeException
      */

diff --git a/library/Zend/Cache/Pattern/PatternInterface.php b/library/Zend/Cache/Pattern/PatternInterface.php
@@ -22,7 +22,7 @@ public function setOptions(PatternOptions $options);
     /**
      * Get all pattern options
      *
-     * @return array
+     * @return PatternOptions
      */
     public function getOptions();
 }
diff --git a/library/Zend/Cache/Pattern/PatternOptions.php b/library/Zend/Cache/Pattern/PatternOptions.php
@@ -593,7 +593,7 @@ public function setObjectKey($objectKey)
      * Used by:
      * - ObjectCache
      *
-     * @return mixed
+     * @return string
      */
     public function getObjectKey()
     {

diff --git a/library/Zend/Cache/Storage/Adapter/ZendServerShm.php b/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
@@ -72,7 +72,7 @@ public function clearByNamespace($namespace)
     /**
      * Get total space in bytes
      *
-     * @return int|float
+     * @return int
      */
     public function getTotalSpace()
     {

diff --git a/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php b/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage\Plugin;
 
-use Zend\Cache\Exception;
 use Zend\Cache\Storage\ExceptionEvent;
 use Zend\EventManager\EventManagerInterface;
 

diff --git a/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php b/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage\Plugin;
 
-use Zend\Cache\Exception;
 use Zend\Cache\Storage\Event;
 use Zend\EventManager\EventManagerInterface;
 

diff --git a/library/Zend/Cache/Storage/Plugin/PluginOptions.php b/library/Zend/Cache/Storage/Plugin/PluginOptions.php
@@ -118,7 +118,7 @@ public function setExceptionCallback($exceptionCallback)
      * Used by:
      * - ExceptionHandler
      *
-     * @return null|callable
+     * @return callable
      */
     public function getExceptionCallback()
     {
@@ -183,7 +183,7 @@ public function getOptimizingFactor()
      *
      * @param  string|SerializerAdapter $serializer
      * @throws Exception\InvalidArgumentException
-     * @return Serializer
+     * @return self
      */
     public function setSerializer($serializer)
     {