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/Adapter/AbstractAdapter.php

@@ -96,8 +96,8 @@ public function writeLine($text = "", $color = null, $bgColor = null)
      */
     public function writeAt($text, $x, $y, $color = null, $bgColor = null)
     {
-        $this->setPos( $x, $y );
-        $this->write( $text, $color, $bgColor );
+        $this->setPos($x, $y);
+        $this->write($text, $color, $bgColor);
     }
 
     /**
@@ -457,7 +457,7 @@ public function clear()
      */
     public function clearLine()
     {
-        echo "\r" . str_repeat( " ", $this->getWidth() ) . "\r";
+        echo "\r" . str_repeat(" ", $this->getWidth()) . "\r";
     }
 
     /**

src/Console.php

@@ -118,8 +118,8 @@ public static function resetInstance()
     public static function isWindows()
     {
         return
-            ( defined('PHP_OS') && ( substr_compare(PHP_OS,'win',0,3,true) === 0) ) ||
-            (getenv('OS') != false && substr_compare(getenv('OS'),'windows',0,7,true))
+            (defined('PHP_OS') && (substr_compare(PHP_OS, 'win', 0, 3, true) === 0)) ||
+            (getenv('OS') != false && substr_compare(getenv('OS'), 'windows', 0, 7, true))
         ;
     }
 
@@ -156,7 +156,7 @@ public static function isConsole()
      */
     public static function overrideIsConsole($flag)
     {
-        if(null != $flag) {
+        if (null != $flag) {
             $flag = (bool) $flag;
         }
         static::$isConsole = $flag;

src/Prompt/Confirm.php

@@ -69,7 +69,7 @@ public function __construct(
     public function show()
     {
         $char = parent::show();
-        if($this->ignoreCase) {
+        if ($this->ignoreCase) {
             $response = strtolower($char) === strtolower($this->yesChar);
         } else {
             $response = $char === $this->yesChar;

src/Prompt/Number.php

@@ -37,8 +37,8 @@ class Number extends Line
      * @param string    $promptText     The prompt text to display in console
      * @param bool      $allowEmpty     Is empty response allowed?
      * @param bool      $allowFloat     Are floating (non-decimal) numbers allowed?
-     * @param integer   $min            Minimum value (inclusive)
-     * @param integer   $max            Maximum value (inclusive)
+     * @param int   $min            Minimum value (inclusive)
+     * @param int   $max            Maximum value (inclusive)
      */
     public function __construct(
         $promptText = 'Please enter a number: ',
@@ -88,7 +88,7 @@ public function show()
             } elseif (!is_numeric($number)) {
                 $this->getConsole()->writeLine("$number is not a number\n");
                 $valid = false;
-            } elseif (!$this->allowFloat && (round($number) != $number) ) {
+            } elseif (!$this->allowFloat && (round($number) != $number)) {
                 $this->getConsole()->writeLine("Please enter a non-floating number, i.e. " . round($number) . "\n");
                 $valid = false;
             } elseif ($this->max !== null && $number > $this->max) {

src/Response.php

@@ -34,7 +34,7 @@ public function contentSent()
     /**
      * Set the error level that will be returned to shell.
      *
-     * @param integer   $errorLevel
+     * @param int   $errorLevel
      * @return Response
      */
     public function setErrorLevel($errorLevel)
@@ -46,7 +46,7 @@ public function setErrorLevel($errorLevel)
     /**
      * Get response error level that will be returned to shell.
      *
-     * @return integer|0
+     * @return int|0
      */
     public function getErrorLevel()
     {