Implement review comments.

quilius · quilius · commit a848d957a28a · 2025-01-14T22:54:46.000+01:00
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -6,7 +6,7 @@ CHANGELOG
 
  * Add DSN param `retry_period` to override default email transport retry period
  * Add `Dsn::getBooleanOption()`
- * Add DSN param `force_ipv4` to enforce binding to IPv4
+ * Add DSN param `source_ip` to allow binding to a specific IPv4 or IPv6 address. If you want to bind IPv4 without specifying an address, use `0.0.0.0`.
 
 7.2
 ---
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
@@ -182,22 +182,16 @@ public static function createProvider(): iterable
         ];
 
         $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
-        $transport->forceIpv4();
+        $transport->getStream()->setSourceIp('0.0.0.0');
         yield [
-            Dsn::fromString('smtps://:@example.com:465?force_ipv4=true'),
+            Dsn::fromString('smtps://:@example.com:465?source_ip=0.0.0.0'),
             $transport,
         ];
 
         $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
-        $transport->forceIpv4();
+        $transport->getStream()->setSourceIp('[2606:4700:20::681a:5fb]');
         yield [
-            Dsn::fromString('smtps://:@example.com:465?force_ipv4'),
-            $transport,
-        ];
-
-        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
-        yield [
-            Dsn::fromString('smtps://:@example.com:465?force_ipv4=false'),
+            Dsn::fromString('smtps://:@example.com:465?source_ip=2606:4700:20::681a:5fb'),
             $transport,
         ];
     }
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -71,14 +71,6 @@ public function __construct(string $host = 'localhost', int $port = 0, ?bool $tl
         $stream->setPort($port);
     }
 
-    public function forceIpv4(): void
-    {
-        $stream = $this->getStream();
-        if ($stream instanceof SocketStream) {
-            $stream->setSourceIp('0.0.0.0');
-        }
-    }
-
     /**
      * @return $this
      */
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php
@@ -32,16 +32,17 @@ public function create(Dsn $dsn): TransportInterface
         $tls = 'smtps' === $dsn->getScheme() ? true : ($autoTls ? null : false);
         $port = $dsn->getPort(0);
         $host = $dsn->getHost();
-        $forceIpv4 = '' === $dsn->getOption('force_ipv4') || filter_var($dsn->getOption('force_ipv4', false), \FILTER_VALIDATE_BOOL);
 
         $transport = new EsmtpTransport($host, $port, $tls, $this->dispatcher, $this->logger);
         $transport->setAutoTls($autoTls);
-        if ($forceIpv4) {
-            $transport->forceIpv4();
-        }
 
         /** @var SocketStream $stream */
         $stream = $transport->getStream();
+        if ($sourceIp = filter_var($dsn->getOption('source_ip', false), \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+            $stream->setSourceIp("[$sourceIp]");
+        } elseif ($sourceIp = filter_var($dsn->getOption('source_ip', false), \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4)) {
+            $stream->setSourceIp($sourceIp);
+        }
         $streamOptions = $stream->getStreamOptions();
 
         if ('' !== $dsn->getOption('verify_peer') && !filter_var($dsn->getOption('verify_peer', true), \FILTER_VALIDATE_BOOL)) {
