Migrate Mailgun transport

Author: driesvints

composer.json

@@ -90,7 +90,8 @@
         "pda/pheanstalk": "^4.0",
         "phpunit/phpunit": "^9.4",
         "predis/predis": "^1.1.2",
-        "symfony/cache": "^6.0"
+        "symfony/cache": "^6.0",
+        "symfony/mailgun-mailer": "^6.0"
     },
     "provide": {
         "psr/container-implementation": "1.0"
@@ -153,6 +154,8 @@
         "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)."
     },

src/Illuminate/Mail/MailManager.php

@@ -4,18 +4,18 @@
 
 use Aws\SesV2\SesV2Client;
 use Closure;
-use GuzzleHttp\Client as HttpClient;
 use Illuminate\Contracts\Mail\Factory as FactoryContract;
 use Illuminate\Log\LogManager;
 use Illuminate\Mail\Transport\ArrayTransport;
 use Illuminate\Mail\Transport\LogTransport;
-use Illuminate\Mail\Transport\MailgunTransport;
 use Illuminate\Mail\Transport\SesTransport;
 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\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\FailoverTransport;
 use Symfony\Component\Mailer\Transport\SendmailTransport;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -280,20 +280,28 @@ protected function createMailTransport()
      * Create an instance of the Mailgun Swift Transport driver.
      *
      * @param  array  $config
-     * @return \Illuminate\Mail\Transport\MailgunTransport
+     * @return \Symfony\Component\Mailer\Transport\TransportInterface
      */
     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', []);
         }
 
-        return new MailgunTransport(
-            $this->guzzle($config),
+        return $factory->create(new Dsn(
+            'mailgun+api',
+            $config['endpoint'] ?? 'default',
             $config['secret'],
-            $config['domain'],
-            $config['endpoint'] ?? null
-        );
+            $config['domain']
+        ));
     }
 
     /**
@@ -371,21 +379,6 @@ protected function createArrayTransport()
         return new ArrayTransport;
     }
 
-    /**
-     * Get a fresh Guzzle HTTP client instance.
-     *
-     * @param  array  $config
-     * @return \GuzzleHttp\Client
-     */
-    protected function guzzle(array $config)
-    {
-        return new HttpClient(Arr::add(
-            $config['guzzle'] ?? [],
-            'connect_timeout',
-            60
-        ));
-    }
-
     /**
      * Set a global address on the mailer by type.
      *

src/Illuminate/Mail/Transport/MailgunTransport.php

@@ -38,7 +38,8 @@
     },
     "suggest": {
         "aws/aws-sdk-php": "Required to use the SES mail driver (^3.189.0).",
-        "guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^7.2).",
+        "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)."
     },
     "config": {