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/DbTable/CallbackCheckAdapter.php

@@ -45,7 +45,7 @@ public function __construct(
         if (null !== $credentialValidationCallback) {
             $this->setCredentialValidationCallback($credentialValidationCallback);
         } else {
-            $this->setCredentialValidationCallback(function($a, $b){
+            $this->setCredentialValidationCallback(function($a, $b) {
                 return $a === $b;
             });
         }

src/Adapter/Http.php

@@ -84,7 +84,7 @@ class Http implements AdapterInterface
     /**
      * Nonce timeout period
      *
-     * @var integer
+     * @var int
      */
     protected $nonceTimeout;
 
@@ -491,7 +491,7 @@ protected function _basicAuth($header)
             && !is_array($result)
             && $this->_secureStringCompare($result, $creds[1])
         ) {
-            $identity = array('username'=>$creds[0], 'realm'=>$this->realm);
+            $identity = array('username' => $creds[0], 'realm' => $this->realm);
             return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
         } elseif (is_array($result)) {
             return new Authentication\Result(Authentication\Result::SUCCESS, $result);
@@ -583,7 +583,7 @@ protected function _digestAuth($header)
         // If our digest matches the client's let them in, otherwise return
         // a 401 code and exit to prevent access to the protected resource.
         if ($this->_secureStringCompare($digest, $data['response'])) {
-            $identity = array('username'=>$data['username'], 'realm'=>$data['realm']);
+            $identity = array('username' => $data['username'], 'realm' => $data['realm']);
             return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
         }
 

src/Result.php

@@ -77,7 +77,7 @@ public function __construct($code, $identity, array $messages = array())
 
         if ($code < self::FAILURE_UNCATEGORIZED) {
             $code = self::FAILURE;
-        } elseif ($code > self::SUCCESS ) {
+        } elseif ($code > self::SUCCESS) {
             $code = 1;
         }
 

src/Storage/Chain.php

@@ -33,7 +33,7 @@ public function __construct()
 
     /**
      * @param StorageInterface $storage
-     * @param integer          $priority
+     * @param int          $priority
      */
     public function add(StorageInterface $storage, $priority = 1)
     {