Merge branch '4.3' into 4.4

fabpot · fabpot · commit bec0996c2cd9 · 2019-09-04T12:09:07.000+02:00
* 4.3:
  maintain sender/recipient name in SMTP envelopes
  Fix #32148 TransportException was not thrown
diff --git a/AbstractStream.php b/AbstractStream.php
@@ -41,7 +41,7 @@ public function write(string $bytes, $debug = true): void
         $bytesToWrite = \strlen($bytes);
         $totalBytesWritten = 0;
         while ($totalBytesWritten < $bytesToWrite) {
-            $bytesWritten = fwrite($this->in, substr($bytes, $totalBytesWritten));
+            $bytesWritten = @fwrite($this->in, substr($bytes, $totalBytesWritten));
             if (false === $bytesWritten || 0 === $bytesWritten) {
                 throw new TransportException('Unable to write bytes on the wire.');
             }
diff --git a/DelayedSmtpEnvelope.php b/DelayedSmtpEnvelope.php
@@ -45,7 +45,7 @@ public function getSender(): Address
             return parent::getSender();
         }
 
-        return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());
+        return self::getSenderFromHeaders($this->message->getHeaders());
     }
 
     public function setRecipients(array $recipients): void
@@ -73,7 +73,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array
         foreach (['to', 'cc', 'bcc'] as $name) {
             foreach ($headers->all($name) as $header) {
                 foreach ($header->getAddresses() as $address) {
-                    $recipients[] = new Address($address->getAddress());
+                    $recipients[] = $address;
                 }
             }
         }
diff --git a/Smtp/SmtpTransport.php b/Smtp/SmtpTransport.php
@@ -165,9 +165,9 @@ protected function doSend(SentMessage $message): void
     {
         try {
             $envelope = $message->getEnvelope();
-            $this->doMailFromCommand($envelope->getSender()->toString());
+            $this->doMailFromCommand($envelope->getSender()->getAddress());
             foreach ($envelope->getRecipients() as $recipient) {
-                $this->doRcptToCommand($recipient->toString());
+                $this->doRcptToCommand($recipient->getAddress());
             }
 
             $this->executeCommand("DATA\r\n", [354]);
diff --git a/Smtp/Stream/AbstractStream.php b/Smtp/Stream/AbstractStream.php
@@ -41,7 +41,7 @@ public function write(string $bytes, $debug = true): void
         $bytesToWrite = \strlen($bytes);
         $totalBytesWritten = 0;
         while ($totalBytesWritten < $bytesToWrite) {
-            $bytesWritten = fwrite($this->in, substr($bytes, $totalBytesWritten));
+            $bytesWritten = @fwrite($this->in, substr($bytes, $totalBytesWritten));
             if (false === $bytesWritten || 0 === $bytesWritten) {
                 throw new TransportException('Unable to write bytes on the wire.');
             }
diff --git a/SmtpEnvelopeTest.php b/SmtpEnvelopeTest.php
@@ -57,19 +57,19 @@ public function testSenderFromHeaders()
         $headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('return@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('return@symfony.com', 'return'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxHeader('Sender', new Address('sender@symfony.com', 'sender'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('sender@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('sender@symfony.com', 'sender'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testSenderFromHeadersWithoutFrom()
@@ -78,18 +78,29 @@ public function testSenderFromHeadersWithoutFrom()
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
         $message->getHeaders()->addMailboxListHeader('From', [new Address('from@symfony.com', 'from')]);
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testRecipientsFromHeaders()
+    {
+        $headers = new Headers();
+        $headers->addPathHeader('Return-Path', 'return@symfony.com');
+        $headers->addMailboxListHeader('To', [new Address('to@symfony.com')]);
+        $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com')]);
+        $headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com')]);
+        $e = SmtpEnvelope::create(new Message($headers));
+        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+    }
+
+    public function testRecipientsFromHeadersWithNames()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', 'return@symfony.com');
         $headers->addMailboxListHeader('To', [new Address('to@symfony.com', 'to')]);
         $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com', 'cc')]);
         $headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com', 'bcc')]);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+        $this->assertEquals([new Address('to@symfony.com', 'to'), new Address('cc@symfony.com', 'cc'), new Address('bcc@symfony.com', 'bcc')], $e->getRecipients());
     }
 
     public function testFromRawMessages()
diff --git a/SmtpTransport.php b/SmtpTransport.php
@@ -165,9 +165,9 @@ protected function doSend(SentMessage $message): void
     {
         try {
             $envelope = $message->getEnvelope();
-            $this->doMailFromCommand($envelope->getSender()->toString());
+            $this->doMailFromCommand($envelope->getSender()->getAddress());
             foreach ($envelope->getRecipients() as $recipient) {
-                $this->doRcptToCommand($recipient->toString());
+                $this->doRcptToCommand($recipient->getAddress());
             }
 
             $this->executeCommand("DATA\r\n", [354]);
diff --git a/Stream/AbstractStream.php b/Stream/AbstractStream.php
@@ -41,7 +41,7 @@ public function write(string $bytes, $debug = true): void
         $bytesToWrite = \strlen($bytes);
         $totalBytesWritten = 0;
         while ($totalBytesWritten < $bytesToWrite) {
-            $bytesWritten = fwrite($this->in, substr($bytes, $totalBytesWritten));
+            $bytesWritten = @fwrite($this->in, substr($bytes, $totalBytesWritten));
             if (false === $bytesWritten || 0 === $bytesWritten) {
                 throw new TransportException('Unable to write bytes on the wire.');
             }
diff --git a/Tests/SmtpEnvelopeTest.php b/Tests/SmtpEnvelopeTest.php
@@ -57,19 +57,19 @@ public function testSenderFromHeaders()
         $headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('return@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('return@symfony.com', 'return'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxHeader('Sender', new Address('sender@symfony.com', 'sender'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('sender@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('sender@symfony.com', 'sender'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testSenderFromHeadersWithoutFrom()
@@ -78,18 +78,29 @@ public function testSenderFromHeadersWithoutFrom()
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
         $message->getHeaders()->addMailboxListHeader('From', [new Address('from@symfony.com', 'from')]);
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testRecipientsFromHeaders()
+    {
+        $headers = new Headers();
+        $headers->addPathHeader('Return-Path', 'return@symfony.com');
+        $headers->addMailboxListHeader('To', [new Address('to@symfony.com')]);
+        $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com')]);
+        $headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com')]);
+        $e = SmtpEnvelope::create(new Message($headers));
+        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+    }
+
+    public function testRecipientsFromHeadersWithNames()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', 'return@symfony.com');
         $headers->addMailboxListHeader('To', [new Address('to@symfony.com', 'to')]);
         $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com', 'cc')]);
         $headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com', 'bcc')]);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+        $this->assertEquals([new Address('to@symfony.com', 'to'), new Address('cc@symfony.com', 'cc'), new Address('bcc@symfony.com', 'bcc')], $e->getRecipients());
     }
 
     public function testFromRawMessages()
diff --git a/Transport/Smtp/SmtpTransport.php b/Transport/Smtp/SmtpTransport.php
@@ -165,9 +165,9 @@ protected function doSend(SentMessage $message): void
     {
         try {
             $envelope = $message->getEnvelope();
-            $this->doMailFromCommand($envelope->getSender()->toString());
+            $this->doMailFromCommand($envelope->getSender()->getAddress());
             foreach ($envelope->getRecipients() as $recipient) {
-                $this->doRcptToCommand($recipient->toString());
+                $this->doRcptToCommand($recipient->getAddress());
             }
 
             $this->executeCommand("DATA\r\n", [354]);
diff --git a/Transport/Smtp/Stream/AbstractStream.php b/Transport/Smtp/Stream/AbstractStream.php
@@ -41,7 +41,7 @@ public function write(string $bytes, $debug = true): void
         $bytesToWrite = \strlen($bytes);
         $totalBytesWritten = 0;
         while ($totalBytesWritten < $bytesToWrite) {
-            $bytesWritten = fwrite($this->in, substr($bytes, $totalBytesWritten));
+            $bytesWritten = @fwrite($this->in, substr($bytes, $totalBytesWritten));
             if (false === $bytesWritten || 0 === $bytesWritten) {
                 throw new TransportException('Unable to write bytes on the wire.');
             }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function write(string $bytes, $debug = true): void`
`41`	`41`	`$bytesToWrite = \strlen($bytes);`
`42`	`42`	`$totalBytesWritten = 0;`
`43`	`43`	`while ($totalBytesWritten < $bytesToWrite) {`
`44`		`- $bytesWritten = fwrite($this->in, substr($bytes, $totalBytesWritten));`
	`44`	`+ $bytesWritten = @fwrite($this->in, substr($bytes, $totalBytesWritten));`
`45`	`45`	`if (false === $bytesWritten \|\| 0 === $bytesWritten) {`
`46`	`46`	`throw new TransportException('Unable to write bytes on the wire.');`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function getSender(): Address`
`45`	`45`	`return parent::getSender();`
`46`	`46`	`}`
`47`	`47`
`48`		`- return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());`
	`48`	`+ return self::getSenderFromHeaders($this->message->getHeaders());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function setRecipients(array $recipients): void`
`@@ -73,7 +73,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array`
`73`	`73`	`foreach (['to', 'cc', 'bcc'] as $name) {`
`74`	`74`	`foreach ($headers->all($name) as $header) {`
`75`	`75`	`foreach ($header->getAddresses() as $address) {`
`76`		`- $recipients[] = new Address($address->getAddress());`
	`76`	`+ $recipients[] = $address;`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,9 @@ protected function doSend(SentMessage $message): void`
`165`	`165`	`{`
`166`	`166`	`try {`
`167`	`167`	`$envelope = $message->getEnvelope();`
`168`		`- $this->doMailFromCommand($envelope->getSender()->toString());`
	`168`	`+ $this->doMailFromCommand($envelope->getSender()->getAddress());`
`169`	`169`	`foreach ($envelope->getRecipients() as $recipient) {`
`170`		`- $this->doRcptToCommand($recipient->toString());`
	`170`	`+ $this->doRcptToCommand($recipient->getAddress());`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`$this->executeCommand("DATA\r\n", [354]);`
-Original file line number
+Diff line change
         $headers->addPathHeader('Return-Path', new Address('[email protected]', 'return'));
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create(new Message($headers));
 -        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
 +        $this->assertEquals(new Address('[email protected]', 'return'), $e->getSender());
         $headers = new Headers();
         $headers->addMailboxHeader('Sender', new Address('[email protected]', 'sender'));
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create(new Message($headers));
 -        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
 +        $this->assertEquals(new Address('[email protected]', 'sender'), $e->getSender());
         $headers = new Headers();
         $headers->addMailboxListHeader('From', [new Address('[email protected]', 'from'), '[email protected]']);
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create(new Message($headers));
 -        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
 +        $this->assertEquals(new Address('[email protected]', 'from'), $e->getSender());
+    }
     public function testSenderFromHeadersWithoutFrom()
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create($message = new Message($headers));
         $message->getHeaders()->addMailboxListHeader('From', [new Address('[email protected]', 'from')]);
 -        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
 +        $this->assertEquals(new Address('[email protected]', 'from'), $e->getSender());
+    }
     public function testRecipientsFromHeaders()
 +    {
 +        $headers = new Headers();
 +        $headers->addPathHeader('Return-Path', '[email protected]');
 +        $headers->addMailboxListHeader('To', [new Address('[email protected]')]);
 +        $headers->addMailboxListHeader('Cc', [new Address('[email protected]')]);
 +        $headers->addMailboxListHeader('Bcc', [new Address('[email protected]')]);
 +        $e = SmtpEnvelope::create(new Message($headers));
 +        $this->assertEquals([new Address('[email protected]'), new Address('[email protected]'), new Address('[email protected]')], $e->getRecipients());
 +    }
++
 +    public function testRecipientsFromHeadersWithNames()
+    {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', '[email protected]');
         $headers->addMailboxListHeader('To', [new Address('[email protected]', 'to')]);
         $headers->addMailboxListHeader('Cc', [new Address('[email protected]', 'cc')]);
         $headers->addMailboxListHeader('Bcc', [new Address('[email protected]', 'bcc')]);
         $e = SmtpEnvelope::create(new Message($headers));
 -        $this->assertEquals([new Address('[email protected]'), new Address('[email protected]'), new Address('[email protected]')], $e->getRecipients());
 +        $this->assertEquals([new Address('[email protected]', 'to'), new Address('[email protected]', 'cc'), new Address('[email protected]', 'bcc')], $e->getRecipients());
+    }
     public function testFromRawMessages()