From 7a614cb1eaaccc7b12353cccdb704293d51aa69a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 21 Feb 2011 11:35:47 +0100 Subject: [PATCH] [Swiftmailer] fixed the determination of the default port --- .../SwiftmailerBundle/DependencyInjection/Configuration.php | 2 +- .../DependencyInjection/SwiftmailerExtension.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php index c04c1f826c..032f03f761 100644 --- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php +++ b/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() diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php index 4a3612c423..99fa362034 100644 --- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php +++ b/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) {