Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/3808'

Close #3808
  • Loading branch information...
commit 7ddf78dbe7e22267756c5b5b7e18134554edc75f 2 parents 79706ce + ce71857
Matthew Weier O'Phinney weierophinney authored
2  library/Zend/Code/NameInformation.php
View
@@ -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)
{
1  library/Zend/Crypt/Password/Bcrypt.php
View
@@ -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)
{
2  library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
View
@@ -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)
{
2  library/Zend/Db/Adapter/Driver/Oci8/Statement.php
View
@@ -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)
{
1  library/Zend/Filter/PregReplace.php
View
@@ -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)
5 library/Zend/Permissions/Rbac/Rbac.php
View
@@ -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)
{
1  library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
View
@@ -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)
5 library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
View
@@ -30,8 +30,9 @@
* 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)
{
5 library/Zend/Stdlib/StringWrapper/Native.php
View
@@ -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)
{
1  library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
View
@@ -105,6 +105,7 @@ public function getApplicationConfig()
/**
* Set the application config
* @param array $applicationConfig
+ * @return AbstractControllerTestCase
* @throws LogicException
*/
public function setApplicationConfig($applicationConfig)
Please sign in to comment.
Something went wrong with that request. Please try again.