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

@@ -30,7 +30,7 @@ class Config implements Countable, Iterator, ArrayAccess
     /**
      * Whether modifications to configuration data are allowed.
      *
-     * @var boolean
+     * @var bool
      */
     protected $allowModifications;
 
@@ -52,7 +52,7 @@ class Config implements Countable, Iterator, ArrayAccess
      * Used when unsetting values during iteration to ensure we do not skip
      * the next element.
      *
-     * @var boolean
+     * @var bool
      */
     protected $skipNextIteration;
 
@@ -63,11 +63,11 @@ class Config implements Countable, Iterator, ArrayAccess
      * on construction.
      *
      * @param  array   $array
-     * @param  boolean $allowModifications
+     * @param  bool $allowModifications
      */
     public function __construct(array $array, $allowModifications = false)
     {
-        $this->allowModifications = (boolean) $allowModifications;
+        $this->allowModifications = (bool) $allowModifications;
 
         foreach ($array as $key => $value) {
             if (is_array($value)) {
@@ -185,7 +185,7 @@ public function toArray()
      * isset() overloading
      *
      * @param  string $name
-     * @return boolean
+     * @return bool
      */
     public function __isset($name)
     {
@@ -276,7 +276,7 @@ public function rewind()
      * valid(): defined by Iterator interface.
      *
      * @see    Iterator::valid()
-     * @return boolean
+     * @return bool
      */
     public function valid()
     {
@@ -288,7 +288,7 @@ public function valid()
      *
      * @see    ArrayAccess::offsetExists()
      * @param  mixed $offset
-     * @return boolean
+     * @return bool
      */
     public function offsetExists($offset)
     {
@@ -396,7 +396,7 @@ public function setReadOnly()
     /**
      * Returns whether this Config object is read only or not.
      *
-     * @return boolean
+     * @return bool
      */
     public function isReadOnly()
     {

src/Factory.php

@@ -63,7 +63,7 @@ class Factory
      * Read a config from a file.
      *
      * @param  string  $filename
-     * @param  boolean $returnConfigObject
+     * @param  bool $returnConfigObject
      * @return array|Config
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException
@@ -113,7 +113,7 @@ public static function fromFile($filename, $returnConfigObject = false)
      * Read configuration from multiple files and merge them.
      *
      * @param  array   $files
-     * @param  boolean $returnConfigObject
+     * @param  bool $returnConfigObject
      * @return array|Config
      */
     public static function fromFiles(array $files, $returnConfigObject = false)

src/Reader/ReaderInterface.php

@@ -29,7 +29,7 @@ public function fromFile($filename);
      * Read from a string and create an array
      *
      * @param  string $string
-     * @return array|boolean
+     * @return array|bool
      */
     public function fromString($string);
 }

src/Writer/AbstractWriter.php

@@ -28,7 +28,7 @@ abstract class AbstractWriter implements WriterInterface
      * @see    WriterInterface::toFile()
      * @param  string  $filename
      * @param  mixed   $config
-     * @param  boolean $exclusiveLock
+     * @param  bool $exclusiveLock
      * @return void
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException

src/Writer/Ini.php

@@ -74,7 +74,7 @@ public function setRenderWithoutSectionsFlags($withoutSections)
     /**
      * Return whether the writer should render without sections.
      *
-     * @return boolean
+     * @return bool
      */
     public function shouldRenderWithoutSections()
     {

src/Writer/WriterInterface.php

@@ -22,7 +22,7 @@ interface WriterInterface
      *
      * @param  string  $filename
      * @param  mixed   $config
-     * @param  boolean $exclusiveLock
+     * @param  bool $exclusiveLock
      * @return void
      */
     public function toFile($filename, $config, $exclusiveLock = true);