Allow custom sendmail command

l-vo · l-vo · commit 7d3ba7221380 · 2020-05-04T18:20:20.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml
@@ -4,6 +4,10 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
+    <parameters>
+        <parameter key="mailer.sendmail_default_command">/usr/sbin/sendmail -bs</parameter>
+    </parameters>
+
     <services>
         <service id="mailer.transport_factory.abstract" class="Symfony\Component\Mailer\Transport\AbstractTransportFactory" abstract="true">
             <argument type="service" id="event_dispatcher" />
@@ -41,6 +45,7 @@
 
         <service id="mailer.transport_factory.sendmail" class="Symfony\Component\Mailer\Transport\SendmailTransportFactory" parent="mailer.transport_factory.abstract">
             <tag name="mailer.transport_factory" />
+            <argument type="string">%mailer.sendmail_default_command%</argument>
         </service>
 
         <service id="mailer.transport_factory.smtp" class="Symfony\Component\Mailer\Transport\Smtp\EsmtpTransportFactory" parent="mailer.transport_factory.abstract">
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php
@@ -38,16 +38,13 @@ public function createProvider(): iterable
             new Dsn('sendmail+smtp', 'default'),
             new SendmailTransport(null, $this->getDispatcher(), $this->getLogger()),
         ];
+    }
 
-        yield [
-            Dsn::fromString('sendmail://default?command=/usr/local/bin/sendmail%20-t'),
-            new SendmailTransport('/usr/local/bin/sendmail -t', $this->getDispatcher(), $this->getLogger()),
-        ];
-
-        yield [
-            Dsn::fromString('sendmail://default?command=/usr/local/bin/sendmail+-t'),
-            new SendmailTransport('/usr/local/bin/sendmail -t', $this->getDispatcher(), $this->getLogger()),
-        ];
+    public function testCreateWithCustomCommand()
+    {
+        $factory = new SendmailTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger(), '/usr/sbin/sendmail -t');
+        $dsn = new Dsn('sendmail+smtp', 'default');
+        $this->assertEquals(new SendmailTransport('/usr/sbin/sendmail -t', $this->getDispatcher(), $this->getLogger()), $factory->create($dsn));
     }
 
     public function unsupportedSchemeProvider(): iterable
diff --git a/src/Symfony/Component/Mailer/Transport/SendmailTransportFactory.php b/src/Symfony/Component/Mailer/Transport/SendmailTransportFactory.php
@@ -11,17 +11,31 @@
 
 namespace Symfony\Component\Mailer\Transport;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * @author Konstantin Myakshin <molodchick@gmail.com>
  */
 final class SendmailTransportFactory extends AbstractTransportFactory
 {
+    /**
+     * @var string
+     */
+    private $command;
+
+    public function __construct(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null, ?string $command = null)
+    {
+        parent::__construct($dispatcher, $client, $logger);
+        $this->command = $command;
+    }
+
     public function create(Dsn $dsn): TransportInterface
     {
         if ('sendmail+smtp' === $dsn->getScheme() || 'sendmail' === $dsn->getScheme()) {
-            return new SendmailTransport($dsn->getOption('command'), $this->dispatcher, $this->logger);
+            return new SendmailTransport($this->command, $this->dispatcher, $this->logger);
         }
 
         throw new UnsupportedSchemeException($dsn, 'sendmail', $this->getSupportedSchemes());
