Merge branch 'develop'

Prepping for 2.2.0RC1.

src/Header/Sender.php

@@ -41,7 +41,7 @@ public static function fromString($headerLine)
         }
 
         // Check for address, and set if found
-        if (preg_match('^(?P<name>.*?)<(?P<email>[^>]+)>$', $value, $matches)) {
+        if (preg_match('/^(?P<name>.*?)<(?P<email>[^>]+)>$/', $value, $matches)) {
             $name = $matches['name'];
             if (empty($name)) {
                 $name = null;

src/Protocol/AbstractProtocol.php

@@ -31,7 +31,7 @@ abstract class AbstractProtocol
 
     /**
      * Maximum of the transaction log
-     * @var integer
+     * @var int
      */
     protected $maximumLog = 64;
 
@@ -45,7 +45,7 @@ abstract class AbstractProtocol
 
     /**
      * Port number of connection
-     * @var integer
+     * @var int
      */
     protected $port;
 
@@ -89,7 +89,7 @@ abstract class AbstractProtocol
      * Constructor.
      *
      * @param  string  $host OPTIONAL Hostname of remote connection (default: 127.0.0.1)
-     * @param  integer $port OPTIONAL Port number (default: null)
+     * @param  int $port OPTIONAL Port number (default: null)
      * @throws Exception\RuntimeException
      */
     public function __construct($host = '127.0.0.1', $port = null)
@@ -118,7 +118,7 @@ public function __destruct()
     /**
      * Set the maximum log size
      *
-     * @param integer $maximumLog Maximum log size
+     * @param int $maximumLog Maximum log size
      */
     public function setMaximumLog($maximumLog)
     {
@@ -250,7 +250,7 @@ protected function _disconnect()
      *
      * @param  string $request
      * @throws Exception\RuntimeException
-     * @return integer|bool Number of bytes written to remote host
+     * @return int|bool Number of bytes written to remote host
      */
     protected function _send($request)
     {
@@ -276,7 +276,7 @@ protected function _send($request)
     /**
      * Get a line from the stream.
      *
-     * @param  integer $timeout Per-request timeout value if applicable
+     * @param  int $timeout Per-request timeout value if applicable
      * @throws Exception\RuntimeException
      * @return string
      */
@@ -319,7 +319,7 @@ protected function _receive($timeout = null)
      * Throws a Zend_Mail_Protocol_Exception if an unexpected code is returned.
      *
      * @param  string|array $code One or more codes that indicate a successful response
-     * @param  integer $timeout Per-request timeout value if applicable
+     * @param  int $timeout Per-request timeout value if applicable
      * @throws Exception\RuntimeException
      * @return string Last line of response string
      */

src/Protocol/Pop3.php

@@ -245,6 +245,7 @@ public function login($user, $password, $tryApop = true)
         if ($tryApop && $this->timestamp) {
             try {
                 $this->request("APOP $user " . md5($this->timestamp . $password));
+                return;
             } catch (Exception\ExceptionInterface $e) {
                 // ignore
             }

src/Protocol/Smtp.php

@@ -80,7 +80,7 @@ class Smtp extends AbstractProtocol
      * are present.
      *
      * @param  string|array $host
-     * @param  null|integer $port
+     * @param  null|int $port
      * @param  null|array   $config
      * @throws Exception\InvalidArgumentException
      */
@@ -196,7 +196,7 @@ public function helo($host = '127.0.0.1')
     /**
      * Returns the perceived session status
      *
-     * @return boolean
+     * @return bool
      */
     public function hasSession()
     {

src/Storage/AbstractStorage.php

@@ -205,7 +205,7 @@ public function count()
       * ArrayAccess::offsetExists()
       *
       * @param    int     $id
-      * @return   boolean
+      * @return   bool
       */
      public function offsetExists($id)
      {
@@ -248,7 +248,7 @@ public function offsetSet($id, $value)
       * ArrayAccess::offsetUnset()
       *
       * @param    int   $id
-      * @return   boolean success
+      * @return   bool success
       */
      public function offsetUnset($id)
      {