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

@@ -88,7 +88,7 @@ public function __construct($typeOrOptions = null, $casting = true, $translation
     /**
      * Set boolean types
      *
-     * @param  integer|array $type
+     * @param  int|array $type
      * @throws Exception\InvalidArgumentException
      * @return bool
      */

src/Compress/Bz2.php

@@ -47,7 +47,7 @@ public function __construct($options = null)
     /**
      * Returns the set blocksize
      *
-     * @return integer
+     * @return int
      */
     public function getBlocksize()
     {
@@ -57,7 +57,7 @@ public function getBlocksize()
     /**
      * Sets a new blocksize
      *
-     * @param  integer $blocksize
+     * @param  int $blocksize
      * @throws Exception\InvalidArgumentException
      * @return Bz2
      */

src/Compress/Gz.php

@@ -49,7 +49,7 @@ public function __construct($options = null)
     /**
      * Returns the set compression level
      *
-     * @return integer
+     * @return int
      */
     public function getLevel()
     {
@@ -59,7 +59,7 @@ public function getLevel()
     /**
      * Sets a new compression level
      *
-     * @param integer $level
+     * @param int $level
      * @throws Exception\InvalidArgumentException
      * @return Gz
      */

src/File/RenameUpload.php

@@ -99,7 +99,7 @@ public function getUseUploadName()
      */
     public function setUseUploadExtension($flag = true)
     {
-        $this->options['use_upload_extension'] = (boolean) $flag;
+        $this->options['use_upload_extension'] = (bool) $flag;
         return $this;
     }
 
@@ -284,7 +284,7 @@ protected function getFinalTarget($uploadData)
      * @param  string $filename
      * @return string
      */
-    protected function applyRandomToFilename($source,$filename)
+    protected function applyRandomToFilename($source, $filename)
     {
         $info = pathinfo($filename);
         $filename = $info['filename'] . uniqid('_');

src/HtmlEntities.php

@@ -17,7 +17,7 @@ class HtmlEntities extends AbstractFilter
     /**
      * Corresponds to the second htmlentities() argument
      *
-     * @var integer
+     * @var int
      */
     protected $quoteStyle;
 
@@ -78,7 +78,7 @@ public function __construct($options = array())
     /**
      * Returns the quoteStyle option
      *
-     * @return integer
+     * @return int
      */
     public function getQuoteStyle()
     {
@@ -88,7 +88,7 @@ public function getQuoteStyle()
     /**
      * Sets the quoteStyle option
      *
-     * @param  integer $quoteStyle
+     * @param  int $quoteStyle
      * @return HtmlEntities Provides a fluent interface
      */
     public function setQuoteStyle($quoteStyle)

src/Inflector.php

@@ -248,8 +248,8 @@ public function setRules(Array $rules)
      *
      * ex:
      * array(
-     *     ':controller' => array('CamelCaseToUnderscore','StringToLower'),
-     *     ':action'     => array('CamelCaseToUnderscore','StringToLower'),
+     *     ':controller' => array('CamelCaseToUnderscore', 'StringToLower'),
+     *     ':action'     => array('CamelCaseToUnderscore', 'StringToLower'),
      *     'suffix'      => 'phtml'
      *     );
      *

src/Int.php

@@ -17,7 +17,7 @@ class Int extends AbstractFilter
      * Returns (int) $value
      *
      * @param  string $value
-     * @return integer
+     * @return int
      */
     public function filter($value)
     {

src/Null.php

@@ -68,7 +68,7 @@ public function __construct($typeOrOptions = null)
     /**
      * Set boolean types
      *
-     * @param  integer|array $type
+     * @param  int|array $type
      * @throws Exception\InvalidArgumentException
      * @return bool
      */