Merge branch 'hotfix/3808'

Close #3808
zendframework · Feb 19, 2013 · 7ddf78d · 7ddf78d
2 parents 79706ce + ce71857
commit 7ddf78d
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 6 deletions.
diff --git a/library/Zend/Code/NameInformation.php b/library/Zend/Code/NameInformation.php
@@ -63,6 +63,7 @@ public function hasNamespace()
 
     /**
      * @param  array $uses
+     * @return NameInformation
      */
     public function setUses(array $uses)
     {
@@ -74,6 +75,7 @@ public function setUses(array $uses)
 
     /**
      * @param  array $uses
+     * @return NameInformation
      */
     public function addUses(array $uses)
     {

diff --git a/library/Zend/Crypt/Password/Bcrypt.php b/library/Zend/Crypt/Password/Bcrypt.php
@@ -178,6 +178,7 @@ public function getSalt()
      * Set the backward compatibility $2a$ instead of $2y$ for PHP 5.3.7+
      *
      * @param boolean $value
+     * @return Bcrypt
      */
     public function setBackwardCompatibility($value)
     {

diff --git a/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php b/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
@@ -103,6 +103,7 @@ public function registerConnection(Connection $connection)
      * Register statement prototype
      *
      * @param Statement $statementPrototype
+     * @return Oci8
      */
     public function registerStatementPrototype(Statement $statementPrototype)
     {
@@ -123,6 +124,7 @@ public function getStatementPrototype()
      * Register result prototype
      *
      * @param Result $resultPrototype
+     * @return Oci8
      */
     public function registerResultPrototype(Result $resultPrototype)
     {

diff --git a/library/Zend/Db/Adapter/Driver/Oci8/Statement.php b/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
@@ -119,6 +119,7 @@ public function setSql($sql)
      * Set Parameter container
      *
      * @param ParameterContainer $parameterContainer
+     * @return Statement
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
@@ -184,6 +185,7 @@ public function isPrepared()
 
     /**
      * @param string $sql
+     * @return Statement
      */
     public function prepare($sql = null)
     {

diff --git a/library/Zend/Filter/PregReplace.php b/library/Zend/Filter/PregReplace.php
@@ -143,6 +143,7 @@ public function filter($value)
      * Validate a pattern and ensure it does not contain the "e" modifier
      *
      * @param  string $pattern
+     * @return bool
      * @throws Exception\InvalidArgumentException
      */
     protected function validatePattern($pattern)

diff --git a/library/Zend/Permissions/Rbac/Rbac.php b/library/Zend/Permissions/Rbac/Rbac.php
@@ -123,8 +123,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  string                                                  $permission
+     * @param  \Zend\Permissions\Rbac\AssertionInterface|Callable|null $assert
+     * @return bool
      */
     public function isGranted($role, $permission, $assert = null)
     {

diff --git a/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php b/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
@@ -32,6 +32,7 @@ public function __construct($numberOfParameters = 0)
 
     /**
      * @param string $property the name of the property
+     * @return bool
      * @throws InvalidArgumentException
      */
     public function filter($property)

diff --git a/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php b/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
@@ -30,8 +30,9 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
      * Check if the given character encoding is supported by this wrapper
      * and the character encoding to convert to is also supported.
      *
-     * @param string      $encoding
-     * @param string|null $convertEncoding
+     * @param  string      $encoding
+     * @param  string|null $convertEncoding
+     * @return bool
      */
     public static function isSupported($encoding, $convertEncoding = null)
     {

diff --git a/library/Zend/Stdlib/StringWrapper/Native.php b/library/Zend/Stdlib/StringWrapper/Native.php
@@ -26,8 +26,9 @@ class Native extends AbstractStringWrapper
      * Check if the given character encoding is supported by this wrapper
      * and the character encoding to convert to is also supported.
      *
-     * @param string      $encoding
-     * @param string|null $convertEncoding
+     * @param  string      $encoding
+     * @param  string|null $convertEncoding
+     * @return bool
      */
     public static function isSupported($encoding, $convertEncoding = null)
     {

diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -105,6 +105,7 @@ public function getApplicationConfig()
     /**
      * Set the application config
      * @param  array $applicationConfig
+     * @return AbstractControllerTestCase
      * @throws LogicException
      */
     public function setApplicationConfig($applicationConfig)