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/PHPUnit/Controller/AbstractHttpControllerTestCase.php

@@ -137,7 +137,7 @@ public function assertResponseHeaderRegex($header, $pattern)
                 $header, $pattern, $responseHeader->getFieldValue()
             ));
         }
-        $this->assertTrue((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+        $this->assertTrue((bool) preg_match($pattern, $responseHeader->getFieldValue()));
     }
 
     /**
@@ -160,7 +160,7 @@ public function assertNotResponseHeaderRegex($header, $pattern)
                 $header, $pattern
             ));
         }
-        $this->assertFalse((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+        $this->assertFalse((bool) preg_match($pattern, $responseHeader->getFieldValue()));
     }
 
     /**
@@ -254,7 +254,7 @@ public function assertRedirectRegex($pattern)
                 $pattern, $responseHeader->getFieldValue()
             ));
         }
-        $this->assertTrue((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+        $this->assertTrue((bool) preg_match($pattern, $responseHeader->getFieldValue()));
     }
 
     /**
@@ -275,7 +275,7 @@ public function assertNotRedirectRegex($pattern)
                 'Failed asserting response DOES NOT redirect to URL MATCHING "%s"', $pattern
             ));
         }
-        $this->assertFalse((boolean) preg_match($pattern, $responseHeader->getFieldValue()));
+        $this->assertFalse((bool) preg_match($pattern, $responseHeader->getFieldValue()));
     }
 
     /**
@@ -321,7 +321,7 @@ private function xpathQuery($path)
      * Count the dom query executed
      *
      * @param  string $path
-     * @return integer
+     * @return int
      */
     private function queryCount($path)
     {
@@ -332,7 +332,7 @@ private function queryCount($path)
      * Count the dom query executed
      *
      * @param  string $path
-     * @return integer
+     * @return int
      */
     private function xpathQueryCount($path)
     {
@@ -696,7 +696,7 @@ private function queryContentRegexAssertion($path, $pattern, $useXpath = false)
                 $path, $pattern, $result->current()->nodeValue
             ));
         }
-        $this->assertTrue((boolean) preg_match($pattern, $result->current()->nodeValue));
+        $this->assertTrue((bool) preg_match($pattern, $result->current()->nodeValue));
     }
 
     /**
@@ -742,7 +742,7 @@ private function notQueryContentRegexAssertion($path, $pattern, $useXpath = fals
                 $path, $pattern
             ));
         }
-        $this->assertFalse((boolean) preg_match($pattern, $result->current()->nodeValue));
+        $this->assertFalse((bool) preg_match($pattern, $result->current()->nodeValue));
     }
 
     /**