Migrate Postmark transport

Author: driesvints

composer.json

@@ -91,7 +91,8 @@
         "phpunit/phpunit": "^9.4",
         "predis/predis": "^1.1.2",
         "symfony/cache": "^6.0",
-        "symfony/mailgun-mailer": "^6.0"
+        "symfony/mailgun-mailer": "^6.0",
+        "symfony/postmark-mailer": "^6.0"
     },
     "provide": {
         "psr/container-implementation": "1.0"
@@ -140,7 +141,7 @@
         "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.12|^3.0).",
         "filp/whoops": "Required for friendly error pages in development (^2.8).",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
-        "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^7.2).",
+        "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.2).",
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^2.0).",
         "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^2.0).",
@@ -154,10 +155,10 @@
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^5.0|^6.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^6.0).",
         "symfony/filesystem": "Required to enable support for relative symbolic links (^6.0).",
-        "symfony/http-client": "Required to enable support for the Mailgun mail driver when using the https or api scheme (^6.0).",
-        "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail driver (^6.0).",
-        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
-        "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
+        "symfony/http-client": "Required to enable support for the Mailgun mail transport (^6.0).",
+        "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.0).",
+        "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0).",
+        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Mail/MailManager.php

@@ -12,9 +12,9 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
-use Postmark\Transport as PostmarkTransport;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
+use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\FailoverTransport;
 use Symfony\Component\Mailer\Transport\SendmailTransport;
@@ -286,12 +286,6 @@ protected function createMailgunTransport(array $config)
     {
         $factory = new MailgunTransportFactory();
 
-        if (isset($config['dsn'])) {
-            return $factory->create(
-                Dsn::fromString($config['dsn'])
-            );
-        }
-
         if (! isset($config['secret'])) {
             $config = $this->app['config']->get('services.mailgun', []);
         }
@@ -312,14 +306,13 @@ protected function createMailgunTransport(array $config)
      */
     protected function createPostmarkTransport(array $config)
     {
-        $headers = isset($config['message_stream_id']) ? [
-            'X-PM-Message-Stream' => $config['message_stream_id'],
-        ] : [];
+        $factory = new PostmarkTransportFactory();
 
-        return new PostmarkTransport(
-            $config['token'] ?? $this->app['config']->get('services.postmark.token'),
-            $headers
-        );
+        return $factory->create(new Dsn(
+            'postmark+api',
+            'default',
+            $config['token']
+        ));
     }
 
     /**

src/Illuminate/Mail/composer.json

@@ -40,7 +40,7 @@
         "aws/aws-sdk-php": "Required to use the SES mail driver (^3.189.0).",
         "symfony/http-client": "Required to use the Mailgun mail driver (^6.0).",
         "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail driver (^6.0).",
-        "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
+        "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0)."
     },
     "config": {
         "sort-packages": true