Pārlūkot izejas kodu

[Swiftmailer] fixed the determination of the default port

Fabien Potencier 14 gadi atpakaļ
vecāks
revīzija
7a614cb1ea

+ 1 - 1
src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php

@@ -45,7 +45,7 @@ class Configuration
             ->scalarNode('username')->defaultNull()->end()
             ->scalarNode('password')->defaultNull()->end()
             ->scalarNode('host')->defaultValue('localhost')->end()
-            ->scalarNode('port')->defaultValue(25)->end()
+            ->scalarNode('port')->defaultValue(false)->end()
             ->scalarNode('encryption')
                 ->defaultNull()
                 ->validate()

+ 2 - 2
src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php

@@ -71,8 +71,8 @@ class SwiftmailerExtension extends Extension
 
         $container->setAlias('swiftmailer.transport', 'swiftmailer.transport.'.$transport);
 
-        if ('ssl' === $config['encryption'] && !isset($config['port'])) {
-            $config['port'] = 465;
+        if (false === $config['port']) {
+            $config['port'] = 'ssl' === $config['encryption'] ? 465 : 25;
         }
 
         foreach (array('encryption', 'port', 'host', 'username', 'password', 'auth_mode') as $key) {