Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit d588c890978b · 2019-10-22T19:21:12.000+02:00
* 4.4:
  [Debug] remove return types that break FC badly
  [Mailer][MailchimpBridge] Don't send address names if empty string
  [ExpressionLanguage][Lexer] Exponential format for number
  [Mailer] Fix SES Message Id retrieval
  Add .gitignore to .gitattributes
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
+/.gitignore export-ignore
diff --git a/Amazon/.gitattributes b/Amazon/.gitattributes
@@ -1,2 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
+/.gitignore export-ignore
diff --git a/Amazon/Transport/SesApiTransport.php b/Amazon/Transport/SesApiTransport.php
@@ -60,15 +60,17 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
                 'Date' => $date,
                 'Content-Type' => 'application/x-www-form-urlencoded',
             ],
-            'body' => $this->getPayload($email, $envelope),
+            'body' => $payload = $this->getPayload($email, $envelope),
         ]);
 
         $result = new \SimpleXMLElement($response->getContent(false));
         if (200 !== $response->getStatusCode()) {
             throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result->Error->Message, $result->Error->Code), $response);
         }
 
-        $sentMessage->setMessageId($result->SendEmailResult->MessageId);
+        $property = $payload['Action'].'Result';
+
+        $sentMessage->setMessageId($result->{$property}->MessageId);
 
         return $response;
     }
diff --git a/Amazon/Transport/SesHttpTransport.php b/Amazon/Transport/SesHttpTransport.php
@@ -68,7 +68,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
             throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result->Error->Message, $result->Error->Code), $response);
         }
 
-        $message->setMessageId($result->SendEmailResult->MessageId);
+        $message->setMessageId($result->SendRawEmailResult->MessageId);
 
         return $response;
     }
diff --git a/Google/.gitattributes b/Google/.gitattributes
@@ -1,2 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
+/.gitignore export-ignore
diff --git a/Mailchimp/.gitattributes b/Mailchimp/.gitattributes
@@ -1,2 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
+/.gitignore export-ignore
diff --git a/Mailchimp/Transport/MandrillApiTransport.php b/Mailchimp/Transport/MandrillApiTransport.php
@@ -75,12 +75,15 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'html' => $email->getHtmlBody(),
                 'text' => $email->getTextBody(),
                 'subject' => $email->getSubject(),
-                'from_name' => $envelope->getSender()->getName(),
                 'from_email' => $envelope->getSender()->getAddress(),
                 'to' => $this->getRecipients($email, $envelope),
             ],
         ];
 
+        if ('' !== $envelope->getSender()->getName()) {
+            $payload['message']['from_name'] = $envelope->getSender()->getName();
+        }
+
         foreach ($email->getAttachments() as $attachment) {
             $headers = $attachment->getPreparedHeaders();
             $disposition = $headers->getHeaderBody('Content-Disposition');
@@ -122,10 +125,13 @@ protected function getRecipients(Email $email, Envelope $envelope): array
 
             $recipientPayload = [
                 'email' => $recipient->getAddress(),
-                'name' => $recipient->getName(),
                 'type' => $type,
             ];
 
+            if ('' !== $recipient->getName()) {
+                $recipientPayload['name'] = $recipient->getName();
+            }
+
             $recipients[] = $recipientPayload;
         }
 
diff --git a/Mailgun/.gitattributes b/Mailgun/.gitattributes
@@ -1,2 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
+/.gitignore export-ignore
diff --git a/MandrillApiTransport.php b/MandrillApiTransport.php
@@ -75,12 +75,15 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'html' => $email->getHtmlBody(),
                 'text' => $email->getTextBody(),
                 'subject' => $email->getSubject(),
-                'from_name' => $envelope->getSender()->getName(),
                 'from_email' => $envelope->getSender()->getAddress(),
                 'to' => $this->getRecipients($email, $envelope),
             ],
         ];
 
+        if ('' !== $envelope->getSender()->getName()) {
+            $payload['message']['from_name'] = $envelope->getSender()->getName();
+        }
+
         foreach ($email->getAttachments() as $attachment) {
             $headers = $attachment->getPreparedHeaders();
             $disposition = $headers->getHeaderBody('Content-Disposition');
@@ -122,10 +125,13 @@ protected function getRecipients(Email $email, Envelope $envelope): array
 
             $recipientPayload = [
                 'email' => $recipient->getAddress(),
-                'name' => $recipient->getName(),
                 'type' => $type,
             ];
 
+            if ('' !== $recipient->getName()) {
+                $recipientPayload['name'] = $recipient->getName();
+            }
+
             $recipients[] = $recipientPayload;
         }
 
diff --git a/Postmark/.gitattributes b/Postmark/.gitattributes
@@ -1,2 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
+/.gitignore export-ignore
diff --git a/Sendgrid/.gitattributes b/Sendgrid/.gitattributes
@@ -1,2 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
+/.gitignore export-ignore
diff --git a/SesApiTransport.php b/SesApiTransport.php
@@ -60,15 +60,17 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
                 'Date' => $date,
                 'Content-Type' => 'application/x-www-form-urlencoded',
             ],
-            'body' => $this->getPayload($email, $envelope),
+            'body' => $payload = $this->getPayload($email, $envelope),
         ]);
 
         $result = new \SimpleXMLElement($response->getContent(false));
         if (200 !== $response->getStatusCode()) {
             throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result->Error->Message, $result->Error->Code), $response);
         }
 
-        $sentMessage->setMessageId($result->SendEmailResult->MessageId);
+        $property = $payload['Action'].'Result';
+
+        $sentMessage->setMessageId($result->{$property}->MessageId);
 
         return $response;
     }
diff --git a/SesHttpTransport.php b/SesHttpTransport.php
@@ -68,7 +68,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
             throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result->Error->Message, $result->Error->Code), $response);
         }
 
-        $message->setMessageId($result->SendEmailResult->MessageId);
+        $message->setMessageId($result->SendRawEmailResult->MessageId);
 
         return $response;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/Tests export-ignore`
`2`	`2`	`/phpunit.xml.dist export-ignore`
	`3`	`+/.gitignore export-ignore`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface`
`68`	`68`	`throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result->Error->Message, $result->Error->Code), $response);`
`69`	`69`	`}`
`70`	`70`
`71`		`- $message->setMessageId($result->SendEmailResult->MessageId);`
	`71`	`+ $message->setMessageId($result->SendRawEmailResult->MessageId);`
`72`	`72`
`73`	`73`	`return $response;`
`74`	`74`	`}`