Merge branch 'hotfix/11' into develop

Forward port #11

Author: weierophinney

CHANGELOG.md

@@ -20,3 +20,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#26](https://github.com/zendframework/zend-mail/pull/26) fixes the
   `ContentType` header to properly handle parameters with encoded values.
+- [#11](https://github.com/zendframework/zend-mail/pull/11) fixes the
+  behavior of the `Sender` header, ensuring it can handle domains that do not
+  contain a TLD, as well as addresses referencing mailboxes (no domain).

src/Header/Sender.php

@@ -53,6 +53,8 @@ public static function fromString($headerLine)
                 $senderName = null;
             }
             $senderEmail = $matches['email'];
+        } else {
+            $senderEmail = $value;
         }
 
         $header->setAddress($senderEmail, $senderName);

test/Header/SenderTest.php

@@ -31,15 +31,15 @@ public function testGetFieldNameReturnsHeaderName()
     }
 
     /**
-     * @dataProvider validSenderDataProvider
+     * @dataProvider validSenderHeaderDataProvider
      * @group ZF2015-04
      * @param string $email
      * @param null|string $name
      * @param string $expectedFieldValue,
      * @param string $encodedValue
      * @param string $encoding
      */
-    public function testParseValidSenderHeader($email, $name, $expectedFieldValue, $encodedValue, $encoding)
+    public function testParseValidSenderHeader($expectedFieldValue, $encodedValue, $encoding)
     {
         $header = Header\Sender::fromString('Sender:' . $encodedValue);
 
@@ -145,6 +145,20 @@ public function validSenderDataProvider()
         ];
     }
 
+    public function validSenderHeaderDataProvider()
+    {
+        return array_merge(array_map(function ($parameters) {
+            return array_slice($parameters, 2);
+        }, $this->validSenderDataProvider()), [
+            // Per RFC 2822, 3.4 and 3.6.2, "Sender: foo@bar" is valid.
+            'Unbracketed email' => [
+                '<foo@bar>',
+                'foo@bar',
+                'ASCII'
+            ]
+        ]);
+    }
+
     public function invalidSenderDataProvider()
     {
         $mailInvalidArgumentException = 'Zend\Mail\Exception\InvalidArgumentException';