Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix mismatches between the PHPDoc and the method signatures #3827

Closed
wants to merge 1 commit into from

3 participants

@micheh

No description provided.

@Maks3w
Collaborator

This pull request cannot be automatically merged. Can you rebase it or merge current master branch?

@micheh

Sure, rebased onto 9598a97.

@weierophinney weierophinney was assigned
@weierophinney weierophinney referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop
Forward port #3827
1221f0c
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3827'
Close #3827
421a1e9
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop
Forward port #3827
4d3bf79
@weierophinney weierophinney referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@weierophinney weierophinney referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@weierophinney weierophinney referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@weierophinney weierophinney referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@weierophinney weierophinney referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@weierophinney weierophinney referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-modulemanager
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
efdf726
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-modulemanager
@weierophinney weierophinney Merge branch 'hotfix/3827' 027f505
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-modulemanager
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop be06b37
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-test
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
f2238eb
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-test
@weierophinney weierophinney Merge branch 'hotfix/3827' 63f8588
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-test
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop e99d604
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-stdlib
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
4e2a1ed
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-stdlib
@weierophinney weierophinney Merge branch 'hotfix/3827' 1a5b402
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-stdlib
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop c24924a
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-crypt
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
9fdbf2c
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-crypt
@weierophinney weierophinney Merge branch 'hotfix/3827' df4d984
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-crypt
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop f1a161a
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-http
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
eed9099
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-http
@weierophinney weierophinney Merge branch 'hotfix/3827' f4ac37b
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-http
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop 14ad3a0
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-filter
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
33fdec9
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-filter
@weierophinney weierophinney Merge branch 'hotfix/3827' 4a23da8
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-filter
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop 99bec49
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-json
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
4f89a30
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-json
@weierophinney weierophinney Merge branch 'hotfix/3827' 2a10a27
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-json
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop e1c3e3c
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-validator
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
82d409b
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-validator
@weierophinney weierophinney Merge branch 'hotfix/3827' 22fa741
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-validator
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop e20548c
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-dom
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
376ddab
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-dom
@weierophinney weierophinney Merge branch 'hotfix/3827' de9f81e
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-dom
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop b11a11a
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-session
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
8231bc2
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-session
@weierophinney weierophinney Merge branch 'hotfix/3827' 370a890
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-session
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop 79d9ad3
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-log
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
040137b
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-log
@weierophinney weierophinney Merge branch 'hotfix/3827' 34ed3ed
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-log
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop 3783159
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-view
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
6adbe71
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-view
@weierophinney weierophinney Merge branch 'hotfix/3827' c2f4e25
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-view
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop 8092a66
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-permissions-rbac
@weierophinney weierophinney Merge pull request zendframework/zf2#3827 from micheh/hotfix/phpdoc-m…
…ismatch

Fix mismatches between the PHPDoc and the method signatures
fec5c3c
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-permissions-rbac
@weierophinney weierophinney Merge branch 'hotfix/3827' 94d722b
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-permissions-rbac
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop 256605f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 22, 2013
This page is out of date. Refresh to see the latest.
Showing with 60 additions and 49 deletions.
  1. +2 −1  library/Zend/Code/Generator/ClassGenerator.php
  2. +3 −2 library/Zend/Crypt/Password/Apache.php
  3. +1 −0  library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
  4. +2 −1  library/Zend/Db/TableGateway/Feature/SequenceFeature.php
  5. +2 −0  library/Zend/Dom/NodeList.php
  6. +1 −1  library/Zend/Filter/UriNormalize.php
  7. +1 −3 library/Zend/Form/View/Helper/Form.php
  8. +3 −4 library/Zend/Http/Client/Adapter/Test.php
  9. +1 −1  library/Zend/Http/Client/Cookies.php
  10. +1 −1  library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
  11. +4 −2 library/Zend/Json/Json.php
  12. +2 −1  library/Zend/Log/Writer/AbstractWriter.php
  13. +5 −4 library/Zend/Log/Writer/FingersCrossed.php
  14. +1 −0  library/Zend/Log/Writer/ZendMonitor.php
  15. +1 −1  library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
  16. +2 −0  library/Zend/Mvc/Controller/AbstractRestfulController.php
  17. +4 −0 library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
  18. +1 −1  library/Zend/Permissions/Rbac/AssertionInterface.php
  19. +5 −3 library/Zend/Permissions/Rbac/Rbac.php
  20. +2 −4 library/Zend/Session/Storage/AbstractSessionArrayStorage.php
  21. +1 −2  library/Zend/Session/Storage/ArrayStorage.php
  22. +3 −0  library/Zend/Stdlib/ArrayObject.php
  23. +2 −1  library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
  24. +1 −0  library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
  25. +1 −1  library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
  26. +0 −3  library/Zend/Stdlib/StringWrapper/Iconv.php
  27. +0 −3  library/Zend/Stdlib/StringWrapper/Intl.php
  28. +0 −3  library/Zend/Stdlib/StringWrapper/MbString.php
  29. +0 −2  library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
  30. +4 −0 library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
  31. +0 −3  library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
  32. +1 −1  library/Zend/Validator/StringLength.php
  33. +2 −0  library/Zend/View/Helper/FlashMessenger.php
  34. +1 −0  library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
View
3  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)
{
View
5 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)
View
1  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)
{
View
3  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)
{
View
2  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)
View
2  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)
View
4 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)
View
7 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)
View
2  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.
*/
View
2  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)
View
6 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
View
3  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)
{
View
9 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)
View
1  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)
View
2  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)
{
View
2  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 = '')
View
4 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)
View
2  library/Zend/Permissions/Rbac/AssertionInterface.php
@@ -14,7 +14,7 @@
/**
* Assertion method - must return a boolean.
*
- * @param Rbac $bac
+ * @param Rbac $rbac
* @return boolean
*/
public function assert(Rbac $rbac);
View
8 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)
View
6 library/Zend/Session/Storage/AbstractSessionArrayStorage.php
@@ -25,8 +25,6 @@
* 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)
View
3  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)
View
3  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)
View
3  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)
{
View
1  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)
{
View
2  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
View
3  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)
View
3  library/Zend/Stdlib/StringWrapper/Intl.php
@@ -48,7 +48,6 @@ public function __construct()
* Returns the length of the given string
*
* @param string $str
- * @param string $encoding
* @return int|false
*/
public function strlen($str)
@@ -62,7 +61,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)
@@ -76,7 +74,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)
View
3  library/Zend/Stdlib/StringWrapper/MbString.php
@@ -59,7 +59,6 @@ public function __construct()
* Returns the length of the given string
*
* @param string $str
- * @param string $encoding
* @return int|false
*/
public function strlen($str)
@@ -73,7 +72,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)
@@ -87,7 +85,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)
View
2  library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
@@ -64,7 +64,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);
@@ -75,7 +74,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);
View
4 library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -187,6 +187,8 @@ public function getResponse()
* Set the request URL
*
* @param string $url
+ * @param string|null $method
+ * @param array|null $params
* @return AbstractControllerTestCase
*/
public function url($url, $method = HttpRequest::METHOD_GET, $params = array())
@@ -230,6 +232,8 @@ public function url($url, $method = HttpRequest::METHOD_GET, $params = array())
* The URL provided set the request URI in the request object.
*
* @param string $url
+ * @param string|null $method
+ * @param array|null $params
* @throws \Exception
*/
public function dispatch($url, $method = HttpRequest::METHOD_GET, $params = array())
View
3  library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
@@ -179,8 +179,6 @@ public function assertRedirect()
/**
* Assert that response is NOT a redirect
- *
- * @param string $message
*/
public function assertNotRedirect()
{
@@ -220,7 +218,6 @@ public function assertRedirectTo($url)
* Assert that response does not redirect to given URL
*
* @param string $url
- * @param string $message
*/
public function assertNotRedirectTo($url)
{
View
2  library/Zend/Validator/StringLength.php
@@ -142,7 +142,7 @@ public function getStringWrapper()
/**
* Set the string wrapper to detect the string length
*
- * @param StringWrapper
+ * @param StringWrapper $stringWrapper
* @return StringLength
*/
public function setStringWrapper(StringWrapper $stringWrapper)
View
2  library/Zend/View/Helper/FlashMessenger.php
@@ -56,6 +56,7 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
/**
* Returns the flash messenger plugin controller
*
+ * @param string|null $namespace
* @return FlashMessenger|PluginFlashMessenger
*/
public function __invoke($namespace = null)
@@ -237,6 +238,7 @@ public function getPluginFlashMessenger()
/**
* Set the flash messenger plugin
*
+ * @param PluginFlashMessenger $pluginFlashMessenger
* @return FlashMessenger
*/
public function setPluginFlashMessenger(PluginFlashMessenger $pluginFlashMessenger)
View
1  library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
@@ -99,6 +99,7 @@ public function setEscaper(Escaper $escaper)
*
* Lazy-loads one if none available
*
+ * @param string|null $enc Encoding to use
* @return mixed
*/
public function getEscaper($enc = 'UTF-8')
Something went wrong with that request. Please try again.