Merge pull request zendframework/zendframework#1 from wryck7/ZendHydr…

…ator

CS fixes

composer.json

@@ -32,8 +32,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

src/Header/AbstractAddressList.php

@@ -43,7 +43,9 @@ public static function fromString($headerLine)
     {
         $decodedLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
         // split into name/value
-        list($fieldName, $fieldValue) = explode(': ', $decodedLine, 2);
+        list($fieldName, $fieldValue) = explode(':', $decodedLine, 2);
+        $fieldName  = trim($fieldName);
+        $fieldValue = trim($fieldValue);
 
         if (strtolower($fieldName) !== static::$type) {
             throw new Exception\InvalidArgumentException(sprintf(

src/Transport/Sendmail.php

@@ -127,6 +127,15 @@ public function send(Mail\Message $message)
         $headers = $this->prepareHeaders($message);
         $params  = $this->prepareParameters($message);
 
+        // On *nix platforms, we need to replace \r\n with \n
+        // sendmail is not an SMTP server, it is a unix command - it expects LF
+        if (!$this->isWindowsOs()) {
+            $to      = str_replace("\r\n", "\n", $to);
+            $subject = str_replace("\r\n", "\n", $subject);
+            $body    = str_replace("\r\n", "\n", $body);
+            $headers = str_replace("\r\n", "\n", $headers);
+        }
+
         call_user_func($this->callable, $to, $subject, $body, $headers, $params);
     }
 

test/Header/AddressListHeaderTest.php

@@ -105,11 +105,11 @@ public function getStringHeaders()
     {
         $value = $this->getExpectedFieldValue();
         return array(
-            array('Cc: ' . $value, 'Zend\Mail\Header\Cc'),
-            array('Bcc: ' . $value, 'Zend\Mail\Header\Bcc'),
-            array('From: ' . $value, 'Zend\Mail\Header\From'),
-            array('Reply-To: ' . $value, 'Zend\Mail\Header\ReplyTo'),
-            array('To: ' . $value, 'Zend\Mail\Header\To'),
+            'cc'       => array('Cc: ' . $value, 'Zend\Mail\Header\Cc'),
+            'bcc'      => array('Bcc: ' . $value, 'Zend\Mail\Header\Bcc'),
+            'from'     => array('From: ' . $value, 'Zend\Mail\Header\From'),
+            'reply-to' => array('Reply-To: ' . $value, 'Zend\Mail\Header\ReplyTo'),
+            'to'       => array('To: ' . $value, 'Zend\Mail\Header\To'),
         );
     }
 
@@ -133,4 +133,38 @@ public function testDeserializationFromString($headerLine, $class)
         $address = $list->get('[email protected]');
         $this->assertEquals('ZF Announce List', $address->getName());
     }
+
+    public function getStringHeadersWithNoWhitespaceSeparator()
+    {
+        $value = $this->getExpectedFieldValue();
+        return array(
+            'cc'       => array('Cc:' . $value, 'Zend\Mail\Header\Cc'),
+            'bcc'      => array('Bcc:' . $value, 'Zend\Mail\Header\Bcc'),
+            'from'     => array('From:' . $value, 'Zend\Mail\Header\From'),
+            'reply-to' => array('Reply-To:' . $value, 'Zend\Mail\Header\ReplyTo'),
+            'to'       => array('To:' . $value, 'Zend\Mail\Header\To'),
+        );
+    }
+
+    /**
+     * @group 3789
+     * @dataProvider getStringHeadersWithNoWhitespaceSeparator
+     */
+    public function testAllowsNoWhitespaceBetweenHeaderAndValue($headerLine, $class)
+    {
+        $callback = sprintf('%s::fromString', $class);
+        $header   = call_user_func($callback, $headerLine);
+        $this->assertInstanceOf($class, $header);
+        $list = $header->getAddressList();
+        $this->assertEquals(3, count($list));
+        $this->assertTrue($list->has('[email protected]'));
+        $this->assertTrue($list->has('[email protected]'));
+        $this->assertTrue($list->has('[email protected]'));
+        $address = $list->get('[email protected]');
+        $this->assertEquals('ZF DevTeam', $address->getName());
+        $address = $list->get('[email protected]');
+        $this->assertNull($address->getName());
+        $address = $list->get('[email protected]');
+        $this->assertEquals('ZF Announce List', $address->getName());
+    }
 }

test/Transport/SendmailTest.php

@@ -83,12 +83,12 @@ public function testReceivesMailArtifactsOnUnixSystems()
         $this->assertEquals('ZF DevTeam <[email protected]>', $this->to);
         $this->assertEquals('Testing Zend\Mail\Transport\Sendmail', $this->subject);
         $this->assertEquals('This is only a test.', trim($this->message));
-        $this->assertNotContains("To: ZF DevTeam <[email protected]>\r\n", $this->additional_headers);
-        $this->assertContains("Cc: [email protected]\r\n", $this->additional_headers);
-        $this->assertContains("Bcc: \"CR-Team, ZF Project\" <[email protected]>\r\n", $this->additional_headers);
-        $this->assertContains("From: [email protected],\r\n Matthew <[email protected]>\r\n", $this->additional_headers);
-        $this->assertContains("X-Foo-Bar: Matthew\r\n", $this->additional_headers);
-        $this->assertContains("Sender: Ralph Schindler <[email protected]>\r\n", $this->additional_headers);
+        $this->assertNotContains("To: ZF DevTeam <[email protected]>\n", $this->additional_headers);
+        $this->assertContains("Cc: [email protected]\n", $this->additional_headers);
+        $this->assertContains("Bcc: \"CR-Team, ZF Project\" <[email protected]>\n", $this->additional_headers);
+        $this->assertContains("From: [email protected],\n Matthew <[email protected]>\n", $this->additional_headers);
+        $this->assertContains("X-Foo-Bar: Matthew\n", $this->additional_headers);
+        $this->assertContains("Sender: Ralph Schindler <[email protected]>\n", $this->additional_headers);
         $this->assertEquals('-R hdrs -f [email protected]', $this->additional_parameters);
     }