Merge branch 'hotfix/3342' into develop

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

src/Input.php

@@ -21,12 +21,12 @@
 class Input implements InputInterface
 {
     /**
-     * @var boolean
+     * @var bool
      */
     protected $allowEmpty = false;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $breakOnFailure = false;
 
@@ -46,12 +46,12 @@ class Input implements InputInterface
     protected $name;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $notEmptyValidator = false;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $required = true;
 
@@ -76,7 +76,7 @@ public function __construct($name = null)
     }
 
     /**
-     * @param  boolean $allowEmpty
+     * @param  bool $allowEmpty
      * @return Input
      */
     public function setAllowEmpty($allowEmpty)
@@ -86,7 +86,7 @@ public function setAllowEmpty($allowEmpty)
     }
 
     /**
-     * @param  boolean $breakOnFailure
+     * @param  bool $breakOnFailure
      * @return Input
      */
     public function setBreakOnFailure($breakOnFailure)
@@ -126,7 +126,7 @@ public function setName($name)
     }
 
     /**
-     * @param  boolean $required
+     * @param  bool $required
      * @return Input
      */
     public function setRequired($required)
@@ -166,15 +166,15 @@ public function setFallbackValue($value)
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function allowEmpty()
     {
         return $this->allowEmpty;
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function breakOnFailure()
     {
@@ -217,7 +217,7 @@ public function getRawValue()
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isRequired()
     {
@@ -275,7 +275,7 @@ public function merge(InputInterface $input)
 
     /**
      * @param  mixed $context Extra "context" to provide the validator
-     * @return boolean
+     * @return bool
      */
     public function isValid($context = null)
     {