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
zendframework · Apr 29, 2013 · 062b17e · 062b17e
commit 062b17e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Helper/Identity.php b/src/Helper/Identity.php
@@ -34,7 +34,7 @@ class Identity extends AbstractHelper
      */
     public function __invoke()
     {
-        if (!$this->authenticationService instanceof AuthenticationService){
+        if (!$this->authenticationService instanceof AuthenticationService) {
             throw new Exception\RuntimeException('No AuthenticationService instance provided');
         }
 

diff --git a/src/Helper/Layout.php b/src/Helper/Layout.php
@@ -89,7 +89,7 @@ public function setTemplate($template)
      */
     protected function getViewModelHelper()
     {
-        if(null === $this->viewModelHelper) {
+        if (null === $this->viewModelHelper) {
             $this->viewModelHelper = $this->getView()->plugin('view_model');
         }
 

diff --git a/src/Helper/Navigation/AbstractHelper.php b/src/Helper/Navigation/AbstractHelper.php
@@ -338,7 +338,7 @@ public function accept(AbstractPage $page, $recursive = true)
      * Determines whether a page should be allowed given certain parameters
      *
      * @param   array   $params
-     * @return  boolean
+     * @return  bool
      */
     protected function isAllowed($params)
     {

diff --git a/src/Helper/PartialLoop.php b/src/Helper/PartialLoop.php
@@ -23,7 +23,7 @@ class PartialLoop extends Partial
     /**
      * Marker to where the pointer is at in the loop
      *
-     * @var integer
+     * @var int
      */
     protected $partialCounter = 0;