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/Exception/InvalidUriPartException.php

@@ -14,7 +14,7 @@ class InvalidUriPartException extends InvalidArgumentException
     /**
      * Part-specific error codes
      *
-     * @var integer
+     * @var int
      */
     const INVALID_SCHEME    = 1;
     const INVALID_USER      = 2;

src/Http.php

@@ -122,7 +122,7 @@ public function setPassword($password)
      * default. Users may still enforce allowing other host types.
      *
      * @param  string  $host
-     * @param  integer $allowed
+     * @param  int $allowed
      * @return bool
      */
     public static function validateHost($host, $allowed = self::HOST_DNS_OR_IPV4_OR_IPV6)
@@ -162,7 +162,7 @@ protected function parseUserInfo()
      *
      * If no port is set, will return the default port according to the scheme
      *
-     * @return integer
+     * @return int
      * @see    Zend\Uri\Uri::getPort()
      */
     public function getPort()

src/Uri.php

@@ -69,7 +69,7 @@ class Uri implements UriInterface
     /**
      * URI port
      *
-     * @var integer
+     * @var int
      */
     protected $port;
 
@@ -97,7 +97,7 @@ class Uri implements UriInterface
     /**
      * Which host part types are valid for this URI?
      *
-     * @var integer
+     * @var int
      */
     protected $validHostTypes = self::HOST_ALL;
 
@@ -617,7 +617,7 @@ public function getHost()
     /**
      * Get the URI port
      *
-     * @return integer|null
+     * @return int|null
      */
     public function getPort()
     {
@@ -753,7 +753,7 @@ public function setHost($host)
     /**
      * Set the port part of the URI
      *
-     * @param  integer $port
+     * @param  int $port
      * @return Uri
      */
     public function setPort($port)
@@ -875,7 +875,7 @@ public static function validateUserInfo($userInfo)
      * from what is commonly accepted as valid HTTP URLs for example.
      *
      * @param  string  $host
-     * @param  integer $allowed bitmask of allowed host types
+     * @param  int $allowed bitmask of allowed host types
      * @return bool
      */
     public static function validateHost($host, $allowed = self::HOST_ALL)
@@ -911,7 +911,7 @@ public static function validateHost($host, $allowed = self::HOST_ALL)
      *
      * Valid values include numbers between 1 and 65535, and empty values
      *
-     * @param  integer $port
+     * @param  int $port
      * @return bool
      */
     public static function validatePort($port)
@@ -1155,7 +1155,7 @@ public static function merge($baseUri, $relativeUri)
      * Check if a host name is a valid IP address, depending on allowed IP address types
      *
      * @param  string  $host
-     * @param  integer $allowed allowed address types
+     * @param  int $allowed allowed address types
      * @return bool
      */
     protected static function isValidIpAddress($host, $allowed)
@@ -1253,9 +1253,9 @@ protected static function normalizeHost($host)
      * If the class defines a default port for the current scheme, and the
      * current port is default, it will be unset.
      *
-     * @param  integer $port
+     * @param  int $port
      * @param  string  $scheme
-     * @return integer|null
+     * @return int|null
      */
     protected static function normalizePort($port, $scheme = null)
     {

src/UriInterface.php

@@ -117,7 +117,7 @@ public function getHost();
     /**
      * Get the URI port
      *
-     * @return integer|null
+     * @return int|null
      */
     public function getPort();
 
@@ -202,7 +202,7 @@ public function setHost($host);
     /**
      * Set the port part of the URI
      *
-     * @param  integer $port
+     * @param  int $port
      * @return Uri
      */
     public function setPort($port);