Sendmail command to be customizable

symfony · Jul 24, 2017 · cd4aca4 · cd4aca4
1 parent 556ef62
commit cd4aca4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /vendor/
 /composer.lock
-
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -86,6 +86,7 @@ private function getMailersNode()
             ->children()
                 ->scalarNode('url')->defaultNull()->end()
                 ->scalarNode('transport')->defaultValue('smtp')->end()
+                ->scalarNode('command')->defaultValue('/usr/sbin/sendmail -bs')->end()
                 ->scalarNode('username')->defaultNull()->end()
                 ->scalarNode('password')->defaultNull()->end()
                 ->scalarNode('host')->defaultValue('localhost')->end()

diff --git a/DependencyInjection/SwiftmailerTransportFactory.php b/DependencyInjection/SwiftmailerTransportFactory.php
@@ -63,6 +63,8 @@ public static function createTransport(array $options, RequestContext $requestCo
                 $eventDispatcher
             );
 
+            $transport->setCommand($options['command']);
+
             $smtpTransportConfigurator = new SmtpTransportConfigurator(null, $requestContext);
             $smtpTransportConfigurator->configure($transport);
         } elseif ('null' === $options['transport']) {
@@ -92,6 +94,7 @@ public static function resolveOptions(array $options)
             'local_domain' => null,
             'encryption' => null,
             'auth_mode' => null,
+            'command' => null
         );
 
         if (isset($options['url'])) {

diff --git a/Resources/config/schema/swiftmailer-1.0.xsd b/Resources/config/schema/swiftmailer-1.0.xsd
@@ -52,6 +52,7 @@
       <xsd:attribute name="disable-delivery" type="xsd:boolean" />
       <xsd:attribute name="sender-address" type="xsd:boolean" />
       <xsd:attribute name="url" type="xsd:string" />
+      <xsd:attribute name="command" type="xsd:string" />
   </xsd:attributeGroup>
 
   <xsd:complexType name="mailer">

diff --git a/Tests/DependencyInjection/Fixtures/config/php/sendmail.php b/Tests/DependencyInjection/Fixtures/config/php/sendmail.php
@@ -3,4 +3,5 @@
 $container->loadFromExtension('swiftmailer', array(
     'transport' => 'sendmail',
     'local_domain' => 'local.example.org',
+    'command' => '/usr/sbin/sendmail -bs'
 ));
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/sendmail.xml b/Tests/DependencyInjection/Fixtures/config/xml/sendmail.xml
@@ -9,5 +9,6 @@
     <swiftmailer:config
         transport="sendmail"
         local-domain="local.example.org"
+        command="/usr/sbin/sendmail -bs"
     />
 </container>
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/sendmail.yml b/Tests/DependencyInjection/Fixtures/config/yml/sendmail.yml
@@ -1,3 +1,4 @@
 swiftmailer:
     transport:  sendmail
     local_domain: local.example.org
+    command: /usr/sbin/sendmail -bs
diff --git a/Tests/DependencyInjection/SwiftmailerTransportFactoryTest.php b/Tests/DependencyInjection/SwiftmailerTransportFactoryTest.php
@@ -53,6 +53,7 @@ public function testCreateTransportWithSendmail()
     {
         $options = array(
             'transport' => 'sendmail',
+            'command' => '/usr/sbin/sendmail -bs'
         );
 
         $transport = SwiftmailerTransportFactory::createTransport(
@@ -178,6 +179,7 @@ public function optionsAndResultExpected()
                     'transport' => 'null',
                     'username' => null,
                     'password' => null,
+                    'command' => null,
                     'host' => null,
                     'port' => 25,
                     'timeout' => null,
@@ -196,6 +198,7 @@ public function optionsAndResultExpected()
                     'transport' => 'smtp',
                     'username' => 'user',
                     'password' => 'pass',
+                    'command' => null,
                     'host' => 'host',
                     'port' => 1234,
                     'timeout' => null,
@@ -214,6 +217,7 @@ public function optionsAndResultExpected()
                     'transport' => 'sendmail',
                     'username' => 'username',
                     'password' => 'password',
+                    'command' => null,
                     'host' => 'example.com',
                     'port' => 5678,
                     'timeout' => null,
@@ -232,6 +236,7 @@ public function optionsAndResultExpected()
                     'transport' => 'smtp',
                     'username' => 'user',
                     'password' => 'pass',
+                    'command' => null,
                     'host' => 'host',
                     'port' => 1234,
                     'timeout' => 42,
@@ -248,6 +253,7 @@ public function optionsAndResultExpected()
                     'transport' => 'null',
                     'username' => null,
                     'password' => null,
+                    'command' => null,
                     'host' => null,
                     'port' => 25,
                     'timeout' => null,
@@ -265,6 +271,7 @@ public function optionsAndResultExpected()
                     'transport' => 'smtp',
                     'username' => null,
                     'password' => null,
+                    'command' => null,
                     'host' => null,
                     'port' => 25,
                     'timeout' => null,
@@ -282,6 +289,7 @@ public function optionsAndResultExpected()
                     'transport' => 'smtp',
                     'username' => null,
                     'password' => null,
+                    'command' => null,
                     'host' => 'smtp.gmail.com',
                     'port' => 465,
                     'timeout' => null,
@@ -299,6 +307,7 @@ public function optionsAndResultExpected()
                     'transport' => 'sendmail',
                     'username' => null,
                     'password' => null,
+                    'command' => null,
                     'host' => null,
                     'port' => 25,
                     'timeout' => null,
@@ -316,6 +325,7 @@ public function optionsAndResultExpected()
                     'transport' => 'null',
                     'username' => null,
                     'password' => null,
+                    'command' => null,
                     'host' => null,
                     'port' => 465,
                     'timeout' => null,
@@ -333,6 +343,7 @@ public function optionsAndResultExpected()
                     'transport' => 'null',
                     'username' => null,
                     'password' => null,
+                    'command' => null,
                     'host' => null,
                     'port' => 42,
                     'timeout' => null,