Merge pull request zendframework/zendframework#4352 from neeckeloo/do…

…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php

src/BigInteger/Adapter/AdapterInterface.php

@@ -20,7 +20,7 @@ interface AdapterInterface
      * Create adapter-specific representation of a big integer
      *
      * @param  string $operand
-     * @param  integer|null $base
+     * @param  int|null $base
      * @return mixed
      */
     public function init($operand, $base = null);

src/BigInteger/Adapter/Bcmath.php

@@ -307,7 +307,7 @@ public function baseConvert($operand, $fromBase, $toBase = 10)
         $chars = self::BASE62_ALPHABET;
 
         // convert to decimal
-        if ($fromBase == 10 ) {
+        if ($fromBase == 10) {
             $decimal = $operand;
         } else {
             $decimal = '0';
@@ -318,7 +318,7 @@ public function baseConvert($operand, $fromBase, $toBase = 10)
         }
 
         if ($toBase == 10) {
-            return  $decimal;
+            return $decimal;
         }
 
         // convert decimal to base

src/BigInteger/Adapter/Gmp.php

@@ -20,7 +20,7 @@ class Gmp implements AdapterInterface
      * Create string representing big integer in decimal form from arbitrary integer format
      *
      * @param  string $operand
-     * @param  integer|null $base
+     * @param  int|null $base
      * @return bool|string
      */
     public function init($operand, $base = null)
@@ -292,7 +292,7 @@ public function baseConvert($operand, $fromBase, $toBase = 10)
         $chars = self::BASE62_ALPHABET;
 
         // convert operand to decimal
-        if ($fromBase !== 10 ) {
+        if ($fromBase !== 10) {
             $decimal = '0';
             for ($i = 0, $len = strlen($operand); $i < $len; $i++) {
                 $decimal = gmp_mul($decimal, $fromBase);

src/Rand.php

@@ -27,7 +27,7 @@ abstract class Rand
     /**
      * Generate random bytes using OpenSSL or Mcrypt and mt_rand() as fallback
      *
-     * @param  integer $length
+     * @param  int $length
      * @param  bool $strong true if you need a strong random generator (cryptography)
      * @return string
      * @throws Exception\RuntimeException
@@ -109,10 +109,10 @@ public static function getBoolean($strong = false)
     /**
      * Generate a random integer between $min and $max
      *
-     * @param  integer $min
-     * @param  integer $max
+     * @param  int $min
+     * @param  int $max
      * @param  bool $strong true if you need a strong random generator (cryptography)
-     * @return integer
+     * @return int
      * @throws Exception\DomainException
      */
     public static function getInteger($min, $max, $strong = false)
@@ -170,7 +170,7 @@ public static function getFloat($strong = false)
      * Uses supplied character list for generating the new string.
      * If no character list provided - uses Base 64 character set.
      *
-     * @param  integer $length
+     * @param  int $length
      * @param  string|null $charlist
      * @param  bool $strong  true if you need a strong random generator (cryptography)
      * @return string