Fix stream_options support

fabpot · fabpot · commit 2bdff70805ca · 2020-09-28T08:24:49.000+02:00
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -101,6 +101,7 @@ private function getMailersNode()
                 ->scalarNode('source_ip')->defaultNull()->end()
                 ->scalarNode('local_domain')->defaultNull()->end()
                 ->arrayNode('stream_options')
+                    ->addDefaultsIfNotSet()
                     ->ignoreExtraKeys(false)
                     ->normalizeKeys(false)
                     ->beforeNormalization()
diff --git a/DependencyInjection/SwiftmailerExtension.php b/DependencyInjection/SwiftmailerExtension.php
@@ -187,7 +187,7 @@ protected function configureMailerTransport($name, array $mailer, ContainerBuild
                 ->setConfigurator([new Reference(sprintf('swiftmailer.transport.configurator.%s', $name)), 'configure'])
             ;
 
-            if (isset($mailer['stream_options'])) {
+            if ($mailer['stream_options']) {
                 $container->setParameter(sprintf('swiftmailer.mailer.%s.transport.smtp.stream_options', $name), $mailer['stream_options']);
                 $definitionDecorator->addMethodCall('setStreamOptions', [sprintf('%%swiftmailer.mailer.%s.transport.smtp.stream_options%%', $name)]);
             }
diff --git a/Tests/DependencyInjection/SwiftmailerExtensionTest.php b/Tests/DependencyInjection/SwiftmailerExtensionTest.php
@@ -62,7 +62,7 @@ public function testDefaultConfig($type)
 
         $this->assertEquals('localhost', $container->getParameter('swiftmailer.mailer.default.transport.smtp.host'));
         $this->assertEquals(25, $container->getParameter('swiftmailer.mailer.default.transport.smtp.port'));
-        $this->assertFalse($container->hasParameter('swiftmailer.mailer.default.transport.smtp.stream_options'));
+        $this->assertEmpty($container->getParameter('swiftmailer.mailer.default.transport.smtp.stream_options'));
 
         $this->assertEquals('example.org', $container->get('swiftmailer.mailer.default.transport')->getLocalDomain());
     }

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ protected function configureMailerTransport($name, array $mailer, ContainerBuild`
`187`	`187`	`->setConfigurator([new Reference(sprintf('swiftmailer.transport.configurator.%s', $name)), 'configure'])`
`188`	`188`	`;`
`189`	`189`
`190`		`- if (isset($mailer['stream_options'])) {`
	`190`	`+ if ($mailer['stream_options']) {`
`191`	`191`	`$container->setParameter(sprintf('swiftmailer.mailer.%s.transport.smtp.stream_options', $name), $mailer['stream_options']);`
`192`	`192`	`$definitionDecorator->addMethodCall('setStreamOptions', [sprintf('%%swiftmailer.mailer.%s.transport.smtp.stream_options%%', $name)]);`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function testDefaultConfig($type)`
`62`	`62`
`63`	`63`	`$this->assertEquals('localhost', $container->getParameter('swiftmailer.mailer.default.transport.smtp.host'));`
`64`	`64`	`$this->assertEquals(25, $container->getParameter('swiftmailer.mailer.default.transport.smtp.port'));`
`65`		`- $this->assertFalse($container->hasParameter('swiftmailer.mailer.default.transport.smtp.stream_options'));`
	`65`	`+ $this->assertEmpty($container->getParameter('swiftmailer.mailer.default.transport.smtp.stream_options'));`
`66`	`66`
`67`	`67`	`$this->assertEquals('example.org', $container->get('swiftmailer.mailer.default.transport')->getLocalDomain());`
`68`	`68`	`}`