fix: fix typing

Author: albinhallen

src/Transport/NewsletterTransport.php

@@ -4,6 +4,8 @@
 
 use Exception;
 use GuzzleHttp\Exception\GuzzleException;
+use http\Env;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Transport\AbstractTransport;
 use Lundalogik\NewsletterDriver\Newsletter\AttachmentModel;
@@ -39,9 +41,12 @@ public function __construct(TransactionMail $api)
     protected function doSend(SentMessage $message): void
     {
         try {
-            $this->api->sendBatch(
-                $this->getSendTransactionMailBatchArgs($message)
-            );
+            $originalMessage = $message->getOriginalMessage();
+            if ($originalMessage instanceof Email) {
+                $this->api->sendBatch(
+                    $this->getSendTransactionMailBatchArgs($message->getEnvelope(), $originalMessage)
+                );
+            }
         } catch (GuzzleException $e) {
             throw new TransportException(
                 'Request to Newsletter API failed.',
@@ -55,34 +60,29 @@ protected function doSend(SentMessage $message): void
     /**
      * Get the SendTransactionMailBatchArgs from the message
      *
-     * @param SentMessage $message
-     * @return SendTransactionMailBatchArgs|null
+     * @param Envelope $envelope
+     * @param Email $message
+     * @return SendTransactionMailBatchArgs
      */
-    protected function getSendTransactionMailBatchArgs(SentMessage $message): ?SendTransactionMailBatchArgs
+    protected function getSendTransactionMailBatchArgs(Envelope $envelope, Email $message): SendTransactionMailBatchArgs
     {
         $sendTransactionMailArgs = [];
 
-        $envelope = $message->getEnvelope();
-
         $fromEmail = $envelope->getSender()->getAddress();
         $fromName = $envelope->getSender()->getName();
 
-        $originalMessage = $message->getOriginalMessage();
-
-        if ($originalMessage instanceof Email) {
-            foreach ($envelope->getRecipients() as $index => $to) {
-                $sendTransactionMailArgs[] = (new SendTransactionMailArgs())
-                    ->to($to->getAddress(), $to->getName())
-                    ->from($fromEmail, $fromName)
-                    ->subject($originalMessage->getSubject())
-                    ->htmlContent($originalMessage->getHtmlBody());
-            }
-
-            return new SendTransactionMailBatchArgs(
-                $sendTransactionMailArgs,
-                $this->buildAttachmentModels($originalMessage)
-            );
+        foreach ($envelope->getRecipients() as $index => $to) {
+            $sendTransactionMailArgs[] = (new SendTransactionMailArgs())
+                ->to($to->getAddress(), $to->getName())
+                ->from($fromEmail, $fromName)
+                ->subject($message->getSubject())
+                ->htmlContent($message->getHtmlBody());
         }
+
+        return new SendTransactionMailBatchArgs(
+            $sendTransactionMailArgs,
+            $this->buildAttachmentModels($message)
+        );
     }
 
     /**