[10.x] Add url support for mail config (laravel#46964)

* Add url support for mail config * ci fix * formatting --------- Co-authored-by: Taylor Otwell <[email protected]>
bert-w · May 5, 2023 · 07a5e09 · 07a5e09
1 parent 1e6b467
commit 07a5e09
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Illuminate/Mail/MailManager.php b/src/Illuminate/Mail/MailManager.php
@@ -12,6 +12,7 @@
 use Illuminate\Mail\Transport\SesTransport;
 use Illuminate\Mail\Transport\SesV2Transport;
 use Illuminate\Support\Arr;
+use Illuminate\Support\ConfigurationUrlParser;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
@@ -446,9 +447,17 @@ protected function getConfig(string $name)
         // Here we will check if the "driver" key exists and if it does we will use
         // the entire mail configuration file as the "driver" config in order to
         // provide "BC" for any Laravel <= 6.x style mail configuration files.
-        return $this->app['config']['mail.driver']
+        $config = $this->app['config']['mail.driver']
             ? $this->app['config']['mail']
             : $this->app['config']["mail.mailers.{$name}"];
+
+        if (isset($config['url'])) {
+            $config = array_merge($config, (new ConfigurationUrlParser)->parseConfiguration($config));
+
+            $config['transport'] = Arr::pull($config, 'driver');
+        }
+
+        return $config;
     }
 
     /**

diff --git a/tests/Mail/MailManagerTest.php b/tests/Mail/MailManagerTest.php
@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use Orchestra\Testbench\TestCase;
+use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
 
 class MailManagerTest extends TestCase
 {
@@ -27,6 +28,22 @@ public function testEmptyTransportConfig($transport)
         $this->app['mail.manager']->mailer('custom_smtp');
     }
 
+    public function testMailUrlConfig()
+    {
+        $this->app['config']->set('mail.mailers.smtp_url', [
+            'url' => 'smtp://usr:[email protected]:5876',
+        ]);
+
+        $mailer = $this->app['mail.manager']->mailer('smtp_url');
+        $transport = $mailer->getSymfonyTransport();
+
+        $this->assertInstanceOf(EsmtpTransport::class, $transport);
+        $this->assertSame('usr', $transport->getUsername());
+        $this->assertSame('pwd', $transport->getPassword());
+        $this->assertSame('127.0.0.2', $transport->getStream()->getHost());
+        $this->assertSame(5876, $transport->getStream()->getPort());
+    }
+
     public static function emptyTransportConfigDataProvider()
     {
         return [