Merge branch 'hotfix/3342' into develop

Forward port 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
HolgerW1 · Jan 7, 2013 · 6ac8ca9 · 6ac8ca9
2 parents 035578d + b5b39be
commit 6ac8ca9
Show file tree

Hide file tree

Showing 298 changed files with 896 additions and 896 deletions.
diff --git a/library/Zend/Authentication/Adapter/DbTable.php b/library/Zend/Authentication/Adapter/DbTable.php
@@ -98,7 +98,7 @@ class DbTable implements AdapterInterface
      * different credentials. Default is FALSE and need to be set to true to
      * allow ambiguity usage.
      *
-     * @var boolean
+     * @var bool
      */
     protected $ambiguityIdentity = false;
 
@@ -265,7 +265,7 @@ public function getDbSelect()
      *
      * @param  string|array $returnColumns
      * @param  string|array $omitColumns
-     * @return stdClass|boolean
+     * @return stdClass|bool
      */
     public function getResultRowObject($returnColumns = null, $omitColumns = null)
     {
@@ -339,7 +339,7 @@ public function authenticate()
      * required pieces of information.
      *
      * @throws Exception\RuntimeException in the event that setup was not done properly
-     * @return boolean
+     * @return bool
      */
     protected function _authenticateSetup()
     {
@@ -431,7 +431,7 @@ protected function _authenticateQuerySelect(DbSelect $dbSelect)
      * certain that only one record was returned in the resultset
      *
      * @param  array $resultIdentities
-     * @return boolean|\Zend\Authentication\Result
+     * @return bool|\Zend\Authentication\Result
      */
     protected function _authenticateValidateResultSet(array $resultIdentities)
     {

diff --git a/library/Zend/Authentication/Adapter/Http.php b/library/Zend/Authentication/Adapter/Http.php
@@ -95,7 +95,7 @@ class Http implements AdapterInterface
     /**
      * Whether to send the opaque value in the header. True by default
      *
-     * @var boolean
+     * @var bool
      */
     protected $useOpaque;
 
@@ -126,14 +126,14 @@ class Http implements AdapterInterface
      * Whether or not to do Proxy Authentication instead of origin server
      * authentication (send 407's instead of 401's). Off by default.
      *
-     * @var boolean
+     * @var bool
      */
     protected $imaProxy;
 
     /**
      * Flag indicating the client is IE and didn't bother to return the opaque string
      *
-     * @var boolean
+     * @var bool
      */
     protected $ieNoOpaque;
 

diff --git a/library/Zend/Authentication/Adapter/Ldap.php b/library/Zend/Authentication/Adapter/Ldap.php
@@ -452,7 +452,7 @@ protected function checkGroupMembership(ZendLdap\Ldap $ldap, $canonicalName, $dn
      *
      * @param  array $returnAttribs
      * @param  array $omitAttribs
-     * @return stdClass|boolean
+     * @return stdClass|bool
      */
     public function getAccountObject(array $returnAttribs = array(), array $omitAttribs = array())
     {

diff --git a/library/Zend/Authentication/AuthenticationService.php b/library/Zend/Authentication/AuthenticationService.php
@@ -132,7 +132,7 @@ public function authenticate(Adapter\AdapterInterface $adapter = null)
     /**
      * Returns true if and only if an identity is available from storage
      *
-     * @return boolean
+     * @return bool
      */
     public function hasIdentity()
     {

diff --git a/library/Zend/Authentication/Result.php b/library/Zend/Authentication/Result.php
@@ -94,7 +94,7 @@ public function __construct($code, $identity, array $messages = array())
     /**
      * Returns whether the result represents a successful authentication attempt
      *
-     * @return boolean
+     * @return bool
      */
     public function isValid()
     {

diff --git a/library/Zend/Authentication/Storage/NonPersistent.php b/library/Zend/Authentication/Storage/NonPersistent.php
@@ -31,7 +31,7 @@ class NonPersistent implements StorageInterface
     /**
      * Returns true if and only if storage is empty
      *
-     * @return boolean
+     * @return bool
      */
     public function isEmpty()
     {

diff --git a/library/Zend/Authentication/Storage/Session.php b/library/Zend/Authentication/Storage/Session.php
@@ -92,7 +92,7 @@ public function getMember()
     /**
      * Defined by Zend\Authentication\Storage\StorageInterface
      *
-     * @return boolean
+     * @return bool
      */
     public function isEmpty()
     {

diff --git a/library/Zend/Authentication/Storage/StorageInterface.php b/library/Zend/Authentication/Storage/StorageInterface.php
@@ -21,7 +21,7 @@ interface StorageInterface
      * Returns true if and only if storage is empty
      *
      * @throws \Zend\Authentication\Exception\ExceptionInterface If it is impossible to determine whether storage is empty
-     * @return boolean
+     * @return bool
      */
     public function isEmpty();
 

diff --git a/library/Zend/Barcode/Barcode.php b/library/Zend/Barcode/Barcode.php
@@ -96,7 +96,7 @@ public static function getRendererPluginManager()
      * @param  mixed $renderer        String name of renderer class
      * @param  mixed $barcodeConfig   OPTIONAL; an array or Traversable object with barcode parameters.
      * @param  mixed $rendererConfig  OPTIONAL; an array or Traversable object with renderer parameters.
-     * @param  boolean $automaticRenderError  OPTIONAL; set the automatic rendering of exception
+     * @param  bool $automaticRenderError  OPTIONAL; set the automatic rendering of exception
      * @return Barcode
      * @throws Exception\ExceptionInterface
      */

diff --git a/library/Zend/Barcode/Object/AbstractObject.php b/library/Zend/Barcode/Object/AbstractObject.php
@@ -92,19 +92,19 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Activate/deactivate border of the object
-     * @var boolean
+     * @var bool
      */
     protected $withBorder = false;
 
     /**
      * Activate/deactivate drawing of quiet zones
-     * @var boolean
+     * @var bool
      */
     protected $withQuietZones = true;
 
     /**
      * Force quiet zones even if
-     * @var boolean
+     * @var bool
      */
     protected $mandatoryQuietZones = false;
 
@@ -136,13 +136,13 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Display (or not) human readable text
-     * @var boolean
+     * @var bool
      */
     protected $drawText = true;
 
     /**
      * Adjust (or not) position of human readable characters with barcode
-     * @var boolean
+     * @var bool
      */
     protected $stretchText = false;
 
@@ -162,13 +162,13 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Drawing of checksum
-     * @var boolean
+     * @var bool
      */
     protected $withChecksum = false;
 
     /**
      * Drawing of checksum inside text
-     * @var boolean
+     * @var bool
      */
     protected $withChecksumInText = false;
 
@@ -181,14 +181,14 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Activate automatic addition of leading zeros
      * if barcode length is fixed
-     * @var boolean
+     * @var bool
      */
     protected $addLeadingZeros = true;
 
     /**
      * Activation of mandatory checksum
      * to deactivate unauthorized modification
-     * @var boolean
+     * @var bool
      */
     protected $mandatoryChecksum = false;
 
@@ -440,7 +440,7 @@ public function getBackgroundColor()
 
     /**
      * Activate/deactivate drawing of the bar
-     * @param boolean $value
+     * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      */
     public function setWithBorder($value)
@@ -451,7 +451,7 @@ public function setWithBorder($value)
 
     /**
      * Retrieve if border are draw or not
-     * @return boolean
+     * @return bool
      */
     public function getWithBorder()
     {
@@ -460,7 +460,7 @@ public function getWithBorder()
 
     /**
      * Activate/deactivate drawing of the quiet zones
-     * @param boolean $value
+     * @param  bool $value
      * @return AbstractObject
      */
     public function setWithQuietZones($value)
@@ -471,7 +471,7 @@ public function setWithQuietZones($value)
 
     /**
      * Retrieve if quiet zones are draw or not
-     * @return boolean
+     * @return bool
      */
     public function getWithQuietZones()
     {
@@ -538,7 +538,7 @@ public function getText()
     /**
      * Automatically add leading zeros if barcode length is fixed
      * @param string $text
-     * @param boolean $withoutChecksum
+     * @param  bool $withoutChecksum
      * @return string
      */
     protected function addLeadingZeros($text, $withoutChecksum = false)
@@ -583,7 +583,7 @@ public function getTextToDisplay()
 
     /**
      * Activate/deactivate drawing of text to encode
-     * @param boolean $value
+     * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      */
     public function setDrawText($value)
@@ -594,7 +594,7 @@ public function setDrawText($value)
 
     /**
      * Retrieve if drawing of text to encode is enabled
-     * @return boolean
+     * @return bool
      */
     public function getDrawText()
     {
@@ -604,7 +604,7 @@ public function getDrawText()
     /**
      * Activate/deactivate the adjustment of the position
      * of the characters to the position of the bars
-     * @param boolean $value
+     * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -617,7 +617,7 @@ public function setStretchText($value)
     /**
      * Retrieve if the adjustment of the position of the characters
      * to the position of the bars is enabled
-     * @return boolean
+     * @return bool
      */
     public function getStretchText()
     {
@@ -628,7 +628,7 @@ public function getStretchText()
      * Activate/deactivate the automatic generation
      * of the checksum character
      * added to the barcode text
-     * @param boolean $value
+     * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      */
     public function setWithChecksum($value)
@@ -642,7 +642,7 @@ public function setWithChecksum($value)
     /**
      * Retrieve if the checksum character is automatically
      * added to the barcode text
-     * @return boolean
+     * @return bool
      */
     public function getWithChecksum()
     {
@@ -653,7 +653,7 @@ public function getWithChecksum()
      * Activate/deactivate the automatic generation
      * of the checksum character
      * added to the barcode text
-     * @param boolean $value
+     * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -668,7 +668,7 @@ public function setWithChecksumInText($value)
     /**
      * Retrieve if the checksum character is automatically
      * added to the barcode text
-     * @return boolean
+     * @return bool
      */
     public function getWithChecksumInText()
     {
@@ -785,7 +785,7 @@ public function getInstructions()
      * Add a polygon drawing instruction in the set of instructions
      * @param array $points
      * @param integer $color
-     * @param boolean $filled
+     * @param  bool $filled
      */
     protected function addPolygon(array $points, $color = null, $filled = true)
     {
@@ -975,7 +975,7 @@ public function getWidth($recalculate = false)
     /**
      * Calculate the offset from the left of the object
      * if an orientation is activated
-     * @param boolean $recalculate
+     * @param  bool $recalculate
      * @return float
      */
     public function getOffsetLeft($recalculate = false)
@@ -1002,7 +1002,7 @@ public function getOffsetLeft($recalculate = false)
     /**
      * Calculate the offset from the top of the object
      * if an orientation is activated
-     * @param boolean $recalculate
+     * @param  bool $recalculate
      * @return float
      */
     public function getOffsetTop($recalculate = false)

diff --git a/library/Zend/Barcode/Object/Code128.php b/library/Zend/Barcode/Object/Code128.php
@@ -21,7 +21,7 @@ class Code128 extends AbstractObject
     /**
      * Drawing of checksum
      * (even if it's sometime optional, most of time it's required)
-     * @var boolean
+     * @var bool
      */
     protected $withChecksum = true;
 

diff --git a/library/Zend/Barcode/Object/Code25interleaved.php b/library/Zend/Barcode/Object/Code25interleaved.php
@@ -20,7 +20,7 @@ class Code25interleaved extends Code25
 {
     /**
      * Drawing of bearer bars
-     * @var boolean
+     * @var bool
      */
     private $withBearerBars = false;
 
@@ -35,7 +35,7 @@ protected function getDefaultOptions()
 
     /**
      * Activate/deactivate drawing of bearer bars
-     * @param boolean $value
+     * @param  bool $value
      * @return Code25
      */
     public function setWithBearerBars($value)
@@ -46,7 +46,7 @@ public function setWithBearerBars($value)
 
     /**
      * Retrieve if bearer bars are enabled
-     * @return boolean
+     * @return bool
      */
     public function getWithBearerBars()
     {

diff --git a/library/Zend/Barcode/Object/Error.php b/library/Zend/Barcode/Object/Error.php
@@ -21,7 +21,7 @@ class Error extends AbstractObject
     /**
      * All texts are accepted
      * @param string $value
-     * @return boolean
+     * @return bool
      */
     public function validateText($value)
     {