Merge branch 'hotfix/3827' into develop

Forward port #3827
zendframework · Mar 5, 2013 · 1221f0c · 1221f0c
2 parents 47297fd + 90bf245
commit 1221f0c
Show file tree

Hide file tree

Showing 34 changed files with 60 additions and 49 deletions.
diff --git a/library/Zend/Code/Generator/ClassGenerator.php b/library/Zend/Code/Generator/ClassGenerator.php
@@ -486,7 +486,8 @@ public function addPropertyFromGenerator(PropertyGenerator $property)
     /**
      * Add a class to "use" classes
      *
-     * @param  string $useClass
+     * @param string $use
+     * @param string|null $useAlias
      */
     public function addUse($use, $useAlias = null)
     {

diff --git a/library/Zend/Crypt/Password/Apache.php b/library/Zend/Crypt/Password/Apache.php
@@ -154,7 +154,7 @@ public function verify($password, $hash)
     /**
      * Set the format of the password
      *
-     * @param  integer|string                     $cost
+     * @param  string $format
      * @throws Exception\InvalidArgumentException
      * @return Apache
      */
@@ -242,7 +242,8 @@ protected function toAlphabet64($value)
     /**
      * APR1 MD5 algorithm
      *
-     * @param  string $password
+     * @param  string      $password
+     * @param  null|string $salt
      * @return string
      */
     protected function apr1Md5($password, $salt = null)

diff --git a/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
@@ -34,6 +34,7 @@ class MasterSlaveFeature extends AbstractFeature
      * Constructor
      *
      * @param AdapterInterface $slaveAdapter
+     * @param Sql|null $slaveSql
      */
     public function __construct(AdapterInterface $slaveAdapter, Sql $slaveSql = null)
     {

diff --git a/library/Zend/Db/TableGateway/Feature/SequenceFeature.php b/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
@@ -32,7 +32,8 @@ class SequenceFeature extends AbstractFeature
 
 
     /**
-     * @param null $sequence
+     * @param string $primaryKeyField
+     * @param string $sequenceName
      */
     public function __construct($primaryKeyField, $sequenceName)
     {

diff --git a/library/Zend/Dom/NodeList.php b/library/Zend/Dom/NodeList.php
@@ -167,6 +167,7 @@ public function count()
     /**
      * ArrayAccess: offset exists
      *
+     * @param int $key
      * @return bool
      */
     public function offsetExists($key)
@@ -180,6 +181,7 @@ public function offsetExists($key)
     /**
      * ArrayAccess: get offset
      *
+     * @param int $key
      * @return mixed
      */
     public function offsetGet($key)

diff --git a/library/Zend/Filter/UriNormalize.php b/library/Zend/Filter/UriNormalize.php
@@ -34,7 +34,7 @@ class UriNormalize extends AbstractFilter
     /**
      * Sets filter options
      *
-     * @param  string|array|\Zend\Config\Config $options
+     * @param  array|\Traversable|null $options
      * @return void
      */
     public function __construct($options = null)

diff --git a/library/Zend/Form/View/Helper/Form.php b/library/Zend/Form/View/Helper/Form.php
@@ -51,9 +51,7 @@ public function __invoke(FormInterface $form = null)
     /**
      * Render a form from the provided $form,
      *
-     * @param  ElementInterface          $element
-     * @param  null|string               $buttonContent
-     * @throws Exception\DomainException
+     * @param  FormInterface $form
      * @return string
      */
     public function render(FormInterface $form)

diff --git a/library/Zend/Http/Client/Adapter/Test.php b/library/Zend/Http/Client/Adapter/Test.php
@@ -98,10 +98,9 @@ public function setOptions($options = array())
     /**
      * Connect to the remote server
      *
-     * @param string  $host
-     * @param int     $port
-     * @param  bool $secure
-     * @param int     $timeout
+     * @param  string $host
+     * @param  int    $port
+     * @param  bool   $secure
      * @throws Exception\RuntimeException
      */
     public function connect($host, $port = 80, $secure = false)

diff --git a/library/Zend/Http/Client/Cookies.php b/library/Zend/Http/Client/Cookies.php
@@ -328,7 +328,7 @@ protected function _matchPath($domains, $path)
      * of the cookie.
      *
      * @param Response $response HTTP Response object
-     * @param Uri\Uri|string $uri The requested URI
+     * @param Uri\Uri|string $refUri The requested URI
      * @return Cookies
      * @todo Add the $uri functionality.
      */

diff --git a/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php b/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
@@ -42,7 +42,7 @@ public function __construct($internalValues)
     /**
      * Set a Field Value Part this Field Value Part matched against.
      *
-     * @param AbstractFieldValuePart $matchedPart
+     * @param AbstractFieldValuePart $matchedAgainst
      * @return AbstractFieldValuePart provides fluent interface
      */
     public function setMatchedAgainst(AbstractFieldValuePart $matchedAgainst)

diff --git a/library/Zend/Json/Json.php b/library/Zend/Json/Json.php
@@ -153,8 +153,10 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar
      * NOTE: This method is used internally by the encode method.
      *
      * @see encode
-     * @param mixed $valueToCheck a string - object property to be encoded
-     * @return void
+     * @param mixed $value a string - object property to be encoded
+     * @param array $javascriptExpressions
+     * @param null|string|int $currentKey
+     * @return mixed
      */
     protected static function _recursiveJsonExprFinder(
         &$value, array &$javascriptExpressions, $currentKey = null

diff --git a/library/Zend/Log/Writer/AbstractWriter.php b/library/Zend/Log/Writer/AbstractWriter.php
@@ -284,6 +284,7 @@ public function write(array $event)
      * Set a new formatter for this writer
      *
      * @param  string|Formatter\FormatterInterface $formatter
+     * @param  array|null $options
      * @return self
      * @throws Exception\InvalidArgumentException
      */
@@ -308,7 +309,7 @@ public function setFormatter($formatter, array $options = null)
     /**
      * Set convert write errors to exception flag
      *
-     * @param bool $ignoreWriteErrors
+     * @param bool $convertErrors
      */
     public function setConvertWriteErrorsToExceptions($convertErrors)
     {

diff --git a/library/Zend/Log/Writer/FingersCrossed.php b/library/Zend/Log/Writer/FingersCrossed.php
@@ -100,9 +100,10 @@ public function __construct($writer, $filterOrPriority = null, $bufferSize = 0)
     }
 
     /**
-     * Set a new formatter for this writer
+     * Set a new writer
      *
-     * @param  string|Formatter\FormatterInterface $formatter
+     * @param  string|WriterInterface $writer
+     * @param  array|null $options
      * @return self
      * @throws Exception\InvalidArgumentException
      */
@@ -114,7 +115,7 @@ public function setWriter($writer, array $options = null)
 
         if (!$writer instanceof WriterInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
-                    'Formatter must implement %s\Formatter\FormatterInterface; received "%s"',
+                    'Writer must implement %s\WriterInterface; received "%s"',
                     __NAMESPACE__,
                     is_object($writer) ? get_class($writer) : gettype($writer)
             ));
@@ -141,7 +142,7 @@ public function getWriterPluginManager()
      * Set writer plugin manager
      *
      * @param  string|WriterPluginManager $plugins
-     * @return Logger
+     * @return FingersCrossed
      * @throws Exception\InvalidArgumentException
      */
     public function setWriterPluginManager($plugins)

diff --git a/library/Zend/Log/Writer/ZendMonitor.php b/library/Zend/Log/Writer/ZendMonitor.php
@@ -28,6 +28,7 @@ class ZendMonitor extends AbstractWriter
     /**
      * Constructor
      *
+     * @param array|\Traversable|null $options
      * @return ZendMonitor
      */
     public function __construct($options = null)

diff --git a/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php b/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
@@ -122,7 +122,7 @@ protected function getCachedConfig()
      *
      * Unregisters the ModuleLoader and generates the module class map cache.
      *
-     * @param  ModuleEvent $e
+     * @param  ModuleEvent $event
      */
     public function onLoadModulesPost(ModuleEvent $event)
     {

diff --git a/library/Zend/Mvc/Controller/AbstractRestfulController.php b/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -359,6 +359,8 @@ public function processPostData(Request $request)
     /**
      * Check if request has certain content type
      *
+     * @param  Request $request
+     * @param  string|null $contentType
      * @return boolean
      */
     public function requestHasContentType(Request $request, $contentType = '')

diff --git a/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php b/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
@@ -355,6 +355,7 @@ public function clearMessages()
     /**
      * Clear all messages from specific namespace
      *
+     * @param  string $namespaceToClear
      * @return boolean True if messages were cleared, false if none existed
      */
     public function clearMessagesFromNamespace($namespaceToClear)
@@ -516,6 +517,7 @@ public function getCurrentErrorMessages()
      * Get messages that have been added to the current
      * namespace in specific namespace
      *
+     * @param  string $namespaceToGet
      * @return array
      */
     public function getCurrentMessagesFromNamespace($namespaceToGet)
@@ -549,6 +551,7 @@ public function clearCurrentMessages()
     /**
      * Clear messages from the current namespace
      *
+     * @param  string $namespaceToClear
      * @return boolean
      */
     public function clearCurrentMessagesFromNamespace($namespaceToClear)
@@ -617,6 +620,7 @@ public function count()
     /**
      * Get messages from a specific namespace
      *
+     * @param  string $namespaceToGet
      * @return array
      */
     public function getMessagesFromNamespace($namespaceToGet)

diff --git a/library/Zend/Permissions/Rbac/AssertionInterface.php b/library/Zend/Permissions/Rbac/AssertionInterface.php
@@ -14,7 +14,7 @@ interface AssertionInterface
     /**
      * Assertion method - must return a boolean.
      *
-     * @param  Rbac    $bac
+     * @param  Rbac    $rbac
      * @return boolean
      */
     public function assert(Rbac $rbac);

diff --git a/library/Zend/Permissions/Rbac/Rbac.php b/library/Zend/Permissions/Rbac/Rbac.php
@@ -43,7 +43,8 @@ public function getCreateMissingRoles()
     /**
      * Add a child.
      *
-     * @param  string|RoleInterface                $child
+     * @param  string|RoleInterface               $child
+     * @param  array|RoleInterface|null           $parents
      * @return RoleInterface
      * @throws Exception\InvalidArgumentException
      */
@@ -123,8 +124,9 @@ public function getRole($objectOrName)
     /**
      * Determines if access is granted by checking the role and child roles for permission.
      *
-     * @param  string                                                  $permission
-     * @param  \Zend\Permissions\Rbac\AssertionInterface|Callable|null $assert
+     * @param  RoleInterface|string             $role
+     * @param  string                           $permission
+     * @param  AssertionInterface|Callable|null $assert
      * @return bool
      */
     public function isGranted($role, $permission, $assert = null)

diff --git a/library/Zend/Session/Storage/AbstractSessionArrayStorage.php b/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
@@ -25,8 +25,6 @@ abstract class AbstractSessionArrayStorage implements IteratorAggregate, Storage
      * Constructor
      *
      * @param array|null $input
-     * @param int        $flags
-     * @param string     $iteratorClass
      */
     public function __construct($input = null)
     {
@@ -169,6 +167,7 @@ public function serialize()
     /**
      * Unserialize
      *
+     * @param  string $session
      * @return mixed
      */
     public function unserialize($session)
@@ -448,8 +447,7 @@ protected function setRequestAccessTime($time)
     /**
      * Cast the object to an array
      *
-     * Returns data only, no metadata.
-     *
+     * @param  bool $metaData Whether to include metadata
      * @return array
      */
     public function toArray($metaData = false)

diff --git a/library/Zend/Session/Storage/ArrayStorage.php b/library/Zend/Session/Storage/ArrayStorage.php
@@ -342,8 +342,7 @@ public function fromArray(array $array)
     /**
      * Cast the object to an array
      *
-     * Returns data only, no metadata.
-     *
+     * @param  bool $metaData Whether to include metadata
      * @return array
      */
     public function toArray($metaData = false)

diff --git a/library/Zend/Stdlib/ArrayObject.php b/library/Zend/Stdlib/ArrayObject.php
@@ -74,6 +74,7 @@ public function __construct($input = array(), $flags = self::STD_PROP_LIST, $ite
     /**
      * Returns whether the requested key exists
      *
+     * @param  mixed $key
      * @return boolean
      */
     public function __isset($key)
@@ -276,6 +277,7 @@ public function natsort()
     /**
      * Returns whether the requested key exists
      *
+     * @param  mixed $key
      * @return boolean
      */
     public function offsetExists($key)
@@ -315,6 +317,7 @@ public function offsetSet($key, $value)
     /**
      * Unsets the value at the specified key
      *
+     * @param  mixed $key
      * @return void
      */
     public function offsetUnset($key)

diff --git a/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php b/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
@@ -23,7 +23,8 @@ class MethodMatchFilter implements FilterInterface
     protected $exclude = null;
 
     /**
-     * @param string $method The method to exclude
+     * @param string $method The method to exclude or include
+     * @param bool $exclude If the method should be excluded
      */
     public function __construct($method, $exclude = true)
     {

diff --git a/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php b/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
@@ -28,6 +28,7 @@ class SerializableStrategy implements StrategyInterface
     /**
      *
      * @param mixed $serializer string or SerializerAdapter
+     * @param mixed $serializerOptions
      */
     public function __construct($serializer, $serializerOptions = null)
     {

diff --git a/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php b/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
@@ -139,7 +139,7 @@ public function convert($str, $reverse = false)
     /**
      * Wraps a string to a given number of characters
      *
-     * @param  string  $str
+     * @param  string  $string
      * @param  integer $width
      * @param  string  $break
      * @param  boolean $cut

diff --git a/library/Zend/Stdlib/StringWrapper/Iconv.php b/library/Zend/Stdlib/StringWrapper/Iconv.php
@@ -225,7 +225,6 @@ public function __construct()
      * Returns the length of the given string
      *
      * @param string $str
-     * @param string $encoding
      * @return int|false
      */
     public function strlen($str)
@@ -239,7 +238,6 @@ public function strlen($str)
      * @param string   $str
      * @param int      $offset
      * @param int|null $length
-     * @param string   $encoding
      * @return string|false
      */
     public function substr($str, $offset = 0, $length = null)
@@ -253,7 +251,6 @@ public function substr($str, $offset = 0, $length = null)
      * @param string $haystack
      * @param string $needle
      * @param int    $offset
-     * @param string $encoding
      * @return int|false
      */
     public function strpos($haystack, $needle, $offset = 0)