[Mailer] Fix SES Message Id retrieval

Author: fabpot

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;
     }

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;
     }

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;
     }

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;
     }