Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3342' into develop
Browse files Browse the repository at this point in the history
Forward port zendframework/zendframework#3342

Conflicts:
	library/Zend/File/Transfer/Adapter/AbstractAdapter.php
	library/Zend/File/Transfer/Adapter/Http.php
	library/Zend/File/Transfer/Transfer.php
	library/Zend/Http/Cookies.php
	library/Zend/Soap/Client.php
	library/Zend/Soap/Wsdl.php
	library/Zend/Stdlib/ErrorHandler.php
	library/Zend/Stdlib/Hydrator/ClassMethods.php
	library/Zend/Validator/File/Count.php
	library/Zend/Validator/File/Crc32.php
	library/Zend/Validator/File/ExcludeExtension.php
	library/Zend/Validator/File/ExcludeMimeType.php
	library/Zend/Validator/File/Exists.php
	library/Zend/Validator/File/Extension.php
	library/Zend/Validator/File/FilesSize.php
	library/Zend/Validator/File/Hash.php
	library/Zend/Validator/File/ImageSize.php
	library/Zend/Validator/File/Md5.php
	library/Zend/Validator/File/MimeType.php
	library/Zend/Validator/File/NotExists.php
	library/Zend/Validator/File/Sha1.php
	library/Zend/Validator/File/Size.php
	library/Zend/Validator/File/Upload.php
	library/Zend/Validator/File/WordCount.php
	tests/ZendTest/Validator/File/FilesSizeTest.php
  • Loading branch information
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ItemList.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function key()
/**
* Check if there is a current element after calls to rewind() or next()
*
* @return boolean
* @return bool
*/
public function valid()
{
Expand All @@ -175,7 +175,7 @@ public function rewind()
* Check if an offset exists
*
* @param mixed $offset
* @return boolean
* @return bool
*/
public function offsetExists($offset)
{
Expand Down

0 comments on commit dd6a25d

Please sign in to comment.