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/AddressList.php

@@ -114,7 +114,7 @@ public function has($email)
      * Get an address by email
      *
      * @param  string $email
-     * @return boolean|Address\AddressInterface
+     * @return bool|Address\AddressInterface
      */
     public function get($email)
     {

src/Header/HeaderInterface.php

@@ -20,14 +20,14 @@ interface HeaderInterface
     /**
      * Format value in Mime-Encoding if not US-ASCII encoding is used
      *
-     * @var boolean
+     * @var bool
      */
     const FORMAT_ENCODED = true;
 
     /**
      * Return value with the interval ZF2 value (UTF-8 non-encoded)
      *
-     * @var boolean
+     * @var bool
      */
     const FORMAT_RAW     = false;
 
@@ -50,7 +50,7 @@ public function getFieldName();
     /**
      * Retrieve header value
      *
-     * @param  boolean $format Return the value in Mime::Encoded or in Raw format
+     * @param  bool $format Return the value in Mime::Encoded or in Raw format
      * @return string
      */
     public function getFieldValue($format = HeaderInterface::FORMAT_RAW);

src/Headers.php

@@ -274,7 +274,7 @@ public function clearHeaders()
      * Get all headers of a certain name/type
      *
      * @param  string $name
-     * @return boolean|ArrayIterator|Header\HeaderInterface Returns false if there is no headers with $name in this
+     * @return bool|ArrayIterator|Header\HeaderInterface Returns false if there is no headers with $name in this
      * contain, an ArrayIterator if the header is a MultipleHeadersInterface instance and finally returns
      * HeaderInterface for the rest of cases.
      */

src/Protocol/AbstractProtocol.php

@@ -212,7 +212,7 @@ protected function _addLog($value)
      *
      * @param  string $remote Remote
      * @throws Exception\RuntimeException
-     * @return boolean
+     * @return bool
      */
     protected function _connect($remote)
     {
@@ -254,7 +254,7 @@ protected function _disconnect()
      *
      * @param  string $request
      * @throws Exception\RuntimeException
-     * @return integer|boolean Number of bytes written to remote host
+     * @return integer|bool Number of bytes written to remote host
      */
     protected function _send($request)
     {

src/Protocol/Pop3.php

@@ -152,7 +152,7 @@ public function sendRequest($request)
     /**
      * read a response
      *
-     * @param  boolean $multiline response has multiple lines and should be read until "<nl>.<nl>"
+     * @param  bool $multiline response has multiple lines and should be read until "<nl>.<nl>"
      * @throws Exception\RuntimeException
      * @return string response
      */

src/Protocol/Smtp.php

@@ -40,47 +40,47 @@ class Smtp extends AbstractProtocol
     /**
      * Indicates an smtp session has been started by the HELO command
      *
-     * @var boolean
+     * @var bool
      */
     protected $sess = false;
 
 
     /**
      * Indicates the HELO command has been issues
      *
-     * @var boolean
+     * @var bool
      */
     protected $helo = false;
 
 
     /**
      * Indicates an smtp AUTH has been issued and authenticated
      *
-     * @var boolean
+     * @var bool
      */
     protected $auth = false;
 
 
     /**
      * Indicates a MAIL command has been issued
      *
-     * @var boolean
+     * @var bool
      */
     protected $mail = false;
 
 
     /**
      * Indicates one or more RCTP commands have been issued
      *
-     * @var boolean
+     * @var bool
      */
     protected $rcpt = false;
 
 
     /**
      * Indicates that DATA has been issued and sent
      *
-     * @var boolean
+     * @var bool
      */
     protected $data = null;
 
@@ -162,7 +162,7 @@ public function __construct($host = '127.0.0.1', $port = null, array $config = n
     /**
      * Connect to the server with the parameters given in the constructor.
      *
-     * @return boolean
+     * @return bool
      */
     public function connect()
     {

src/Storage/AbstractStorage.php

@@ -310,7 +310,7 @@ public function next()
      /**
       * Iterator::valid()
       *
-      * @return boolean
+      * @return bool
       */
      public function valid()
      {

src/Storage/Maildir.php

@@ -351,7 +351,7 @@ public function close()
     /**
      * Waste some CPU cycles doing nothing.
      *
-     * @return boolean always return true
+     * @return bool always return true
      */
     public function noop()
     {

src/Storage/Mbox.php

@@ -301,7 +301,7 @@ public function close()
     /**
      * Waste some CPU cycles doing nothing.
      *
-     * @return boolean always return true
+     * @return bool always return true
      */
     public function noop()
     {

src/Storage/Part.php

@@ -380,7 +380,7 @@ public function __get($name)
      * @see Part::hasHeader
      *
      * @param  string
-     * @return boolean
+     * @return bool
      */
     public function __isset($name)
     {

src/Transport/Sendmail.php

@@ -296,7 +296,7 @@ public function mailHandler($to, $subject, $message, $headers, $parameters)
      * @param string $errfile
      * @param string $errline
      * @param array  $errcontext
-     * @return boolean always true
+     * @return bool always true
      */
     public function handleMailErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null)
     {

src/Transport/Smtp.php

@@ -38,7 +38,7 @@ class Smtp implements TransportInterface
     protected $connection;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $autoDisconnect = true;
 
@@ -111,7 +111,7 @@ public function getPluginManager()
     /**
      * Set the automatic disconnection when destruct
      *
-     * @param  boolean $flag
+     * @param  bool $flag
      * @return Smtp
      */
     public function setAutoDisconnect($flag)
@@ -123,7 +123,7 @@ public function setAutoDisconnect($flag)
     /**
      * Get the automatic disconnection value
      *
-     * @return boolean
+     * @return bool
      */
     public function getAutoDisconnect()
     {