CS

leofeyer · leofeyer · commit 9fbdaf8e8572 · 2021-01-07T12:18:15.000+01:00
diff --git a/manager-bundle/src/ContaoManager/Plugin.php b/manager-bundle/src/ContaoManager/Plugin.php
@@ -571,11 +571,7 @@ private function getMailerDsnFromMailerUrl(string $mailerUrl): string
     private function getMailerDsn(ContainerBuilder $container): string
     {
         if (!$container->hasParameter('mailer_transport') || 'sendmail' === $container->getParameter('mailer_transport')) {
-            if (class_exists(NativeTransportFactory::class)) {
-                return 'native://default';
-            }
-
-            return 'sendmail://default';
+            return class_exists(NativeTransportFactory::class) ? 'native://default' : 'sendmail://default';
         }
 
         $transport = 'smtp';
diff --git a/manager-bundle/tests/ContaoManager/PluginTest.php b/manager-bundle/tests/ContaoManager/PluginTest.php
@@ -612,14 +612,20 @@ public function testSetsTheMailerDsn(string $transport, ?string $host, ?string $
 
     public function getMailerParameters(): \Generator
     {
+        $default = 'sendmail://default';
+
+        if (class_exists(NativeTransportFactory::class)) {
+            $default = 'native://default';
+        }
+
         yield [
             'mail',
             null,
             null,
             null,
             null,
             null,
-            $this->supportsNativeMailer() ? 'native://default' : 'sendmail://default',
+            $default,
         ];
 
         yield [
@@ -629,7 +635,7 @@ public function getMailerParameters(): \Generator
             null,
             25,
             null,
-            $this->supportsNativeMailer() ? 'native://default' : 'sendmail://default',
+            $default,
         ];
 
         yield [
@@ -909,9 +915,4 @@ private function getContainer(): PluginContainerBuilder
 
         return $container;
     }
-
-    private function supportsNativeMailer(): bool
-    {
-        return class_exists(NativeTransportFactory::class);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -571,11 +571,7 @@ private function getMailerDsnFromMailerUrl(string $mailerUrl): string`
`571`	`571`	`private function getMailerDsn(ContainerBuilder $container): string`
`572`	`572`	`{`
`573`	`573`	`if (!$container->hasParameter('mailer_transport') \|\| 'sendmail' === $container->getParameter('mailer_transport')) {`
`574`		`- if (class_exists(NativeTransportFactory::class)) {`
`575`		`- return 'native://default';`
`576`		`- }`
`577`		`-`
`578`		`- return 'sendmail://default';`
	`574`	`+ return class_exists(NativeTransportFactory::class) ? 'native://default' : 'sendmail://default';`
`579`	`575`	`}`
`580`	`576`
`581`	`577`	`$transport = 'smtp';`