Fix doc blocks consistency and coding standards PSR2

library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php

@@ -46,7 +46,7 @@ public function __construct(
         if (null !== $credentialValidationCallback) {
             $this->setCredentialValidationCallback($credentialValidationCallback);
         } else {
-            $this->setCredentialValidationCallback(function($a, $b){
+            $this->setCredentialValidationCallback(function($a, $b) {
                 return $a === $b;
             });
         }

library/Zend/Authentication/Adapter/Http.php

@@ -84,7 +84,7 @@ class Http implements AdapterInterface
     /**
      * Nonce timeout period
      *
-     * @var integer
+     * @var int
      */
     protected $nonceTimeout;
 
@@ -491,7 +491,7 @@ protected function _basicAuth($header)
             && !is_array($result)
             && $this->_secureStringCompare($result, $creds[1])
         ) {
-            $identity = array('username'=>$creds[0], 'realm'=>$this->realm);
+            $identity = array('username' => $creds[0], 'realm' => $this->realm);
             return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
         } elseif (is_array($result)) {
             return new Authentication\Result(Authentication\Result::SUCCESS, $result);
@@ -583,7 +583,7 @@ protected function _digestAuth($header)
         // If our digest matches the client's let them in, otherwise return
         // a 401 code and exit to prevent access to the protected resource.
         if ($this->_secureStringCompare($digest, $data['response'])) {
-            $identity = array('username'=>$data['username'], 'realm'=>$data['realm']);
+            $identity = array('username' => $data['username'], 'realm' => $data['realm']);
             return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
         }
 

library/Zend/Authentication/Result.php

@@ -77,7 +77,7 @@ public function __construct($code, $identity, array $messages = array())
 
         if ($code < self::FAILURE_UNCATEGORIZED) {
             $code = self::FAILURE;
-        } elseif ($code > self::SUCCESS ) {
+        } elseif ($code > self::SUCCESS) {
             $code = 1;
         }
 

library/Zend/Authentication/Storage/Chain.php

@@ -33,7 +33,7 @@ public function __construct()
 
     /**
      * @param StorageInterface $storage
-     * @param integer          $priority
+     * @param int          $priority
      */
     public function add(StorageInterface $storage, $priority = 1)
     {

library/Zend/Barcode/Barcode.php

@@ -128,7 +128,7 @@ public static function factory($barcode,
             $renderer = static::makeRenderer($renderer, $rendererConfig);
         } catch (Exception\ExceptionInterface $e) {
             if ($automaticRenderError && !($e instanceof Exception\RendererCreationException)) {
-                $barcode  = static::makeBarcode('error', array( 'text' => $e->getMessage() ));
+                $barcode  = static::makeBarcode('error', array('text' => $e->getMessage()));
                 $renderer = static::makeRenderer($renderer, array());
             } else {
                 throw $e;

library/Zend/Barcode/Object/AbstractObject.php

@@ -39,50 +39,50 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Height of the object
-     * @var integer
+     * @var int
      */
     protected $height = null;
 
     /**
      * Width of the object
-     * @var integer
+     * @var int
      */
     protected $width = null;
 
     /**
      * Height of the bar
-     * @var integer
+     * @var int
      */
     protected $barHeight = 50;
 
     /**
      * Width of a thin bar
-     * @var integer
+     * @var int
      */
     protected $barThinWidth = 1;
 
     /**
      * Width of a thick bar
-     * @var integer
+     * @var int
      */
     protected $barThickWidth = 3;
 
     /**
      * Factor to multiply bar and font measure
      * (barHeight, barThinWidth, barThickWidth & fontSize)
-     * @var integer
+     * @var int
      */
     protected $factor = 1;
 
     /**
      * Font and bars color of the object
-     * @var integer
+     * @var int
      */
     protected $foreColor = 0x000000;
 
     /**
      * Background color of the object
-     * @var integer
+     * @var int
      */
     protected $backgroundColor = 0xFFFFFF;
 
@@ -113,14 +113,14 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Offset from the top the object
      * (calculated from the orientation)
-     * @var integer
+     * @var int
      */
     protected $offsetTop = null;
 
     /**
      * Offset from the left the object
      * (calculated from the orientation)
-     * @var integer
+     * @var int
      */
     protected $offsetLeft = null;
 
@@ -146,7 +146,7 @@ abstract class AbstractObject implements ObjectInterface
      * Font resource
      *  - integer (1 to 5): corresponds to GD included fonts
      *  - string: corresponds to path of a TTF font
-     * @var integer|string
+     * @var int|string
      */
     protected $font = null;
 
@@ -170,7 +170,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Fix barcode length (numeric or string like 'even')
-     * @var integer | string
+     * @var int | string
      */
     protected $barcodeLength = null;
 
@@ -272,7 +272,7 @@ public function getType()
 
     /**
      * Set height of the barcode bar
-     * @param integer $value
+     * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -289,7 +289,7 @@ public function setBarHeight($value)
 
     /**
      * Get height of the barcode bar
-     * @return integer
+     * @return int
      */
     public function getBarHeight()
     {
@@ -298,7 +298,7 @@ public function getBarHeight()
 
     /**
      * Set thickness of thin bar
-     * @param integer $value
+     * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -315,7 +315,7 @@ public function setBarThinWidth($value)
 
     /**
      * Get thickness of thin bar
-     * @return integer
+     * @return int
      */
     public function getBarThinWidth()
     {
@@ -324,7 +324,7 @@ public function getBarThinWidth()
 
     /**
      * Set thickness of thick bar
-     * @param integer $value
+     * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -341,7 +341,7 @@ public function setBarThickWidth($value)
 
     /**
      * Get thickness of thick bar
-     * @return integer
+     * @return int
      */
     public function getBarThickWidth()
     {
@@ -369,7 +369,7 @@ public function setFactor($value)
     /**
      * Get factor applying to
      * thinBarWidth - thickBarWidth - barHeight - fontSize
-     * @return integer
+     * @return int
      */
     public function getFactor()
     {
@@ -398,7 +398,7 @@ public function setForeColor($value)
 
     /**
      * Retrieve color of the barcode and text
-     * @return integer
+     * @return int
      */
     public function getForeColor()
     {
@@ -407,7 +407,7 @@ public function getForeColor()
 
     /**
      * Set the color of the background
-     * @param integer $value
+     * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -427,7 +427,7 @@ public function setBackgroundColor($value)
 
     /**
      * Retrieve background color of the image
-     * @return integer
+     * @return int
      */
     public function getBackgroundColor()
     {
@@ -675,7 +675,7 @@ public function getWithChecksumInText()
      * Set the font:
      *  - if integer between 1 and 5, use gd built-in fonts
      *  - if string, $value is assumed to be the path to a TTF font
-     * @param integer|string $value
+     * @param int|string $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -706,7 +706,7 @@ public function setFont($value)
 
     /**
      * Retrieve the font
-     * @return integer|string
+     * @return int|string
      */
     public function getFont()
     {
@@ -748,7 +748,7 @@ public function getFontSize()
     /**
      * Quiet zone before first bar
      * and after the last bar
-     * @return integer
+     * @return int
      */
     public function getQuietZone()
     {
@@ -780,7 +780,7 @@ public function getInstructions()
     /**
      * Add a polygon drawing instruction in the set of instructions
      * @param array $points
-     * @param integer $color
+     * @param int $color
      * @param  bool $filled
      */
     protected function addPolygon(array $points, $color = null, $filled = true)
@@ -802,7 +802,7 @@ protected function addPolygon(array $points, $color = null, $filled = true)
      * @param float $size
      * @param array $position
      * @param string $font
-     * @param integer $color
+     * @param int $color
      * @param string $alignment
      * @param float $orientation
      */
@@ -862,8 +862,8 @@ protected function checkText($value = null)
 
     /**
      * Check the ratio between the thick and the thin bar
-     * @param integer $min
-     * @param integer $max
+     * @param int $min
+     * @param int $max
      * @return void
      * @throw \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -897,7 +897,7 @@ protected function checkFontAndOrientation()
     /**
      * Width of the result image
      * (before any rotation)
-     * @return integer
+     * @return int
      */
     protected function calculateWidth()
     {
@@ -908,13 +908,13 @@ protected function calculateWidth()
 
     /**
      * Calculate the width of the barcode
-     * @return integer
+     * @return int
      */
     abstract protected function calculateBarcodeWidth();
 
     /**
      * Height of the result object
-     * @return integer
+     * @return int
      */
     protected function calculateHeight()
     {
@@ -925,7 +925,7 @@ protected function calculateHeight()
 
     /**
      * Height of the barcode
-     * @return integer
+     * @return int
      */
     protected function calculateBarcodeHeight()
     {
@@ -941,7 +941,7 @@ protected function calculateBarcodeHeight()
     /**
      * Get height of the result object
      * @param bool $recalculate
-     * @return integer
+     * @return int
      */
     public function getHeight($recalculate = false)
     {
@@ -956,7 +956,7 @@ public function getHeight($recalculate = false)
     /**
      * Get width of the result object
      * @param bool $recalculate
-     * @return integer
+     * @return int
      */
     public function getWidth($recalculate = false)
     {

library/Zend/Barcode/Object/Codabar.php

@@ -32,7 +32,7 @@ class Codabar extends AbstractObject
 
     /**
      * Width of the barcode (in pixels)
-     * @return integer
+     * @return int
      */
     protected function calculateBarcodeWidth()
     {

library/Zend/Barcode/Object/Code128.php

@@ -115,7 +115,7 @@ class Code128 extends AbstractObject
 
     /**
      * Width of the barcode (in pixels)
-     * @return integer
+     * @return int
      */
     protected function calculateBarcodeWidth()
     {

library/Zend/Barcode/Object/Code25.php

@@ -35,7 +35,7 @@ class Code25 extends AbstractObject
 
     /**
      * Width of the barcode (in pixels)
-     * @return integer
+     * @return int
      */
     protected function calculateBarcodeWidth()
     {

library/Zend/Barcode/Object/Code25interleaved.php

@@ -51,7 +51,7 @@ public function getWithBearerBars()
 
     /**
      * Width of the barcode (in pixels)
-     * @return integer
+     * @return int
      */
     protected function calculateBarcodeWidth()
     {

library/Zend/Barcode/Object/Ean13.php

@@ -61,7 +61,7 @@ protected function getDefaultOptions()
 
     /**
      * Width of the barcode (in pixels)
-     * @return integer
+     * @return int
      */
     protected function calculateBarcodeWidth()
     {