diff --git a/src/Client.php b/src/Client.php
index 6b0365b302..78a444fde4 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -282,7 +282,7 @@ public function getLastRawResponse()
     /**
      * Get the redirections count
      *
-     * @return integer
+     * @return int
      */
     public function getRedirectionsCount()
     {
diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
index f06aa866db..c5a11078df 100644
--- a/src/Client/Adapter/Proxy.php
+++ b/src/Client/Adapter/Proxy.php
@@ -192,7 +192,7 @@ public function write($method, $uri, $httpVer = '1.1', $headers = array(), $body
      * Preform handshaking with HTTPS proxy using CONNECT method
      *
      * @param string  $host
-     * @param integer $port
+     * @param int $port
      * @param string  $httpVer
      * @param array   $headers
      * @throws AdapterException\RuntimeException
diff --git a/src/Client/Adapter/Test.php b/src/Client/Adapter/Test.php
index 7e3d407de1..7ccd62541c 100644
--- a/src/Client/Adapter/Test.php
+++ b/src/Client/Adapter/Test.php
@@ -41,7 +41,7 @@ class Test implements AdapterInterface
     /**
      * Current position in the response buffer
      *
-     * @var integer
+     * @var int
      */
     protected $responseIndex = 0;
 
@@ -199,7 +199,7 @@ public function addResponse($response)
      * Sets the position of the response buffer.  Selects which
      * response will be returned on the next call to read().
      *
-     * @param integer $index
+     * @param int $index
      * @throws Exception\OutOfRangeException
      */
     public function setResponseIndex($index)
diff --git a/src/Header/AbstractAccept.php b/src/Header/AbstractAccept.php
index ed518b277c..23be958e45 100644
--- a/src/Header/AbstractAccept.php
+++ b/src/Header/AbstractAccept.php
@@ -419,7 +419,7 @@ protected function sortFieldValueParts()
             }
 
             // Asterisks
-            $values = array('type', 'subtype','format');
+            $values = array('type', 'subtype', 'format');
             foreach ($values as $value) {
                 if ($a->$value == '*' && $b->$value != '*') {
                     return 1;
diff --git a/src/Header/SetCookie.php b/src/Header/SetCookie.php
index d5a2636926..093be4ed06 100644
--- a/src/Header/SetCookie.php
+++ b/src/Header/SetCookie.php
@@ -37,14 +37,14 @@ class SetCookie implements MultipleHeaderInterface
     /**
      * Version
      *
-     * @var integer
+     * @var int
      */
     protected $version = null;
 
     /**
      * Max Age
      *
-     * @var integer
+     * @var int
      */
     protected $maxAge = null;
 
@@ -317,7 +317,7 @@ public function getValue()
     /**
      * Set version
      *
-     * @param integer $version
+     * @param int $version
      * @throws Exception\InvalidArgumentException
      */
     public function setVersion($version)
@@ -331,7 +331,7 @@ public function setVersion($version)
     /**
      * Get version
      *
-     * @return integer
+     * @return int
      */
     public function getVersion()
     {
@@ -341,7 +341,7 @@ public function getVersion()
     /**
      * Set Max-Age
      *
-     * @param integer $maxAge
+     * @param int $maxAge
      * @throws Exception\InvalidArgumentException
      */
     public function setMaxAge($maxAge)
@@ -355,7 +355,7 @@ public function setMaxAge($maxAge)
     /**
      * Get Max-Age
      *
-     * @return integer
+     * @return int
      */
     public function getMaxAge()
     {
diff --git a/src/Response.php b/src/Response.php
index dc5d08885f..f6b99cfd9c 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -233,7 +233,7 @@ public function getCookie()
     /**
      * Set HTTP status code and (optionally) message
      *
-     * @param  integer $code
+     * @param  int $code
      * @throws Exception\InvalidArgumentException
      * @return Response
      */