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/Filter/Alnum.php

@@ -31,7 +31,7 @@ class Alnum extends AbstractLocale
     /**
      * Sets default option values for this instance
      *
-     * @param array|Traversable|boolean|null $allowWhiteSpaceOrOptions
+     * @param array|Traversable|bool|null $allowWhiteSpaceOrOptions
      * @param string|null $locale
      */
     public function __construct($allowWhiteSpaceOrOptions = null, $locale = null)
@@ -49,19 +49,19 @@ public function __construct($allowWhiteSpaceOrOptions = null, $locale = null)
     /**
      * Sets the allowWhiteSpace option
      *
-     * @param  boolean $flag
+     * @param  bool $flag
      * @return Alnum Provides a fluent interface
      */
     public function setAllowWhiteSpace($flag = true)
     {
-        $this->options['allow_white_space'] = (boolean) $flag;
+        $this->options['allow_white_space'] = (bool) $flag;
         return $this;
     }
 
     /**
      * Whether white space is allowed
      *
-     * @return boolean
+     * @return bool
      */
     public function getAllowWhiteSpace()
     {

src/Translator/Loader/Gettext.php

@@ -34,7 +34,7 @@ class Gettext implements FileLoaderInterface
     /**
      * Whether the current file is little endian.
      *
-     * @var boolean
+     * @var bool
      */
     protected $littleEndian;
 

src/Validator/Alnum.php

@@ -62,14 +62,14 @@ public function __construct($allowWhiteSpace = false)
         parent::__construct($options);
 
         if (is_scalar($allowWhiteSpace)) {
-            $this->options['allowWhiteSpace'] = (boolean) $allowWhiteSpace;
+            $this->options['allowWhiteSpace'] = (bool) $allowWhiteSpace;
         }
     }
 
     /**
      * Returns the allowWhiteSpace option
      *
-     * @return boolean
+     * @return bool
      */
     public function getAllowWhiteSpace()
     {
@@ -79,20 +79,20 @@ public function getAllowWhiteSpace()
     /**
      * Sets the allowWhiteSpace option
      *
-     * @param boolean $allowWhiteSpace
+     * @param  bool $allowWhiteSpace
      * @return AlnumFilter Provides a fluent interface
      */
     public function setAllowWhiteSpace($allowWhiteSpace)
     {
-        $this->options['allowWhiteSpace'] = (boolean) $allowWhiteSpace;
+        $this->options['allowWhiteSpace'] = (bool) $allowWhiteSpace;
         return $this;
     }
 
     /**
      * Returns true if and only if $value contains only alphabetic and digit characters
      *
      * @param  string $value
-     * @return boolean
+     * @return bool
      */
     public function isValid($value)
     {

src/Validator/Alpha.php

@@ -54,7 +54,7 @@ class Alpha extends Alnum
      * Returns true if and only if $value contains only alphabetic characters
      *
      * @param  string $value
-     * @return boolean
+     * @return bool
      */
     public function isValid($value)
     {

src/Validator/Float.php

@@ -90,7 +90,7 @@ public function setLocale($locale)
      * Returns true if and only if $value is a floating-point value
      *
      * @param  string $value
-     * @return boolean
+     * @return bool
      * @throws Exception\InvalidArgumentException
      */
     public function isValid($value)

src/Validator/Int.php

@@ -87,7 +87,7 @@ public function setLocale($locale)
      * Returns true if and only if $value is a valid integer
      *
      * @param  string|integer $value
-     * @return boolean
+     * @return bool
      * @throws Exception\InvalidArgumentException
      */
     public function isValid($value)

src/Validator/PostCode.php

@@ -324,7 +324,7 @@ public function setService($service)
      * Returns true if and only if $value is a valid postalcode
      *
      * @param  string $value
-     * @return boolean
+     * @return bool
      * @throws Exception\InvalidArgumentException
      */
     public function isValid($value)

test/Filter/AlnumTest.php

@@ -45,7 +45,7 @@ class AlnumTest extends \PHPUnit_Framework_TestCase
     /**
      * The Alphabet means english alphabet.
      *
-     * @var boolean
+     * @var bool
      */
     protected static $meansEnglishAlphabet;
 

test/Filter/AlphaTest.php

@@ -45,7 +45,7 @@ class AlphaTest extends \PHPUnit_Framework_TestCase
     /**
      * The Alphabet means english alphabet.
      *
-     * @var boolean
+     * @var bool
      */
     protected static $meansEnglishAlphabet;