[SwiftmailerBundle] fixed previous merge

src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php

@@ -83,7 +83,7 @@ class Configuration implements ConfigurationInterface
                 ->scalarNode('sender_address')->end()
                 ->arrayNode('antiflood')
                     ->children()
-                        ->scalarNode('treshold')->defaultValue(99)->end()
+                        ->scalarNode('threshold')->defaultValue(99)->end()
                         ->scalarNode('sleep')->defaultValue(0)->end()
                     ->end()
                 ->end()

src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php

@@ -90,25 +90,20 @@ class SwiftmailerExtension extends Extension
             }
         }
         $container->setParameter('swiftmailer.spool.enabled', isset($config['spool']));
-        
+
         // antiflood?
         if (isset($config['antiflood'])) {
-            foreach (array('treshold', 'sleep') as $key) {
-                $container->setParameter('swiftmailer.antiflood.'.$key, $config['antiflood'][$key]);
-            }
-            
+            $container->setParameter('swiftmailer.plugin.antiflood.threshold', $config['antiflood']['threshold']);
+            $container->setParameter('swiftmailer.plugin.antiflood.sleep', $config['antiflood']['sleep']);
+
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.antiflood')));
-        } else {
-            foreach (array('treshold', 'sleep') as $key) {
-                $container->setParameter('swiftmailer.antiflood.'.$key, null);
-            }
         }
-        
+
         if ($config['logging']) {
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger')));
             $container->findDefinition('swiftmailer.data_collector')->addTag('data_collector', array('template' => 'SwiftmailerBundle:Collector:swiftmailer', 'id' => 'swiftmailer'));
         }
-        
+
         if (isset($config['sender_address']) && $config['sender_address']) {
             $container->setParameter('swiftmailer.sender_address', $config['sender_address']);
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.impersonate')));

src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml

@@ -17,6 +17,8 @@
         <parameter key="swiftmailer.plugin.impersonate.class">Swift_Plugins_ImpersonatePlugin</parameter>
         <parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter>
         <parameter key="swiftmailer.plugin.antiflood.class">Swift_Plugins_AntiFloodPlugin</parameter>
+        <parameter key="swiftmailer.plugin.antiflood.threshold">99</parameter>
+        <parameter key="swiftmailer.plugin.antiflood.sleep">0</parameter>
 
         <parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter>
     </parameters>
@@ -67,8 +69,8 @@
         <service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
         
         <service id="swiftmailer.plugin.antiflood" class="%swiftmailer.plugin.antiflood.class%" public="false">
-            <argument>%swiftmailer.antiflood.treshold%</argument>
-            <argument>%swiftmailer.antiflood.sleep%</argument>
+            <argument>%swiftmailer.plugin.antiflood.threshold%</argument>
+            <argument>%swiftmailer.plugin.antiflood.sleep%</argument>
         </service>
 
         <service id="swiftmailer.plugin.impersonate" class="%swiftmailer.plugin.impersonate.class%" public="false">