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

@@ -79,10 +79,10 @@ public function setOption($key, $value)
             return $this;
         }
 
-        $method = 'set' . ucfirst ($key);
-        if (method_exists ($this, $method)) {
+        $method = 'set' . ucfirst($key);
+        if (method_exists($this, $method)) {
             // Setter exists; use it
-            $this->$method ($value);
+            $this->$method($value);
             $this->options[$key] = $value;
         } elseif (property_exists($this, $key)) {
             // Assume it's metadata

src/AbstractWord.php

@@ -73,7 +73,7 @@ abstract class AbstractWord extends AbstractAdapter
     /**
      * Session lifetime for the captcha data
      *
-     * @var integer
+     * @var int
      */
     protected $timeout = 300;
 
@@ -105,7 +105,7 @@ abstract class AbstractWord extends AbstractAdapter
     /**
      * Length of the word to generate
      *
-     * @var integer
+     * @var int
      */
     protected $wordlen = 8;
 
@@ -134,7 +134,7 @@ public function setSessionClass($sessionClass)
     /**
      * Retrieve word length to use when generating captcha
      *
-     * @return integer
+     * @return int
      */
     public function getWordlen()
     {
@@ -144,7 +144,7 @@ public function getWordlen()
     /**
      * Set word length of captcha
      *
-     * @param integer $wordlen
+     * @param int $wordlen
      * @return AbstractWord
      */
     public function setWordlen($wordlen)