8000 [SwiftmailerBundle] fixed previous merge · DerekRoth/symfony@b83aa9d · GitHub
[go: up one dir, main page]
Skip to content

Commit b83aa9d

Browse files
fabpotfabpot
committed
[SwiftmailerBundle] fixed previous merge
1 parent ce4a49d commit b83aa9d

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function getConfigTreeBuilder()
8383
->scalarNode('sender_address')->end()
8484
->arrayNode('antiflood')
8585
->children()
86-
->scalarNode('treshold')->defaultValue(99)->end()
86+
->scalarNode('threshold')->defaultValue(99)->end()
8787
->scalarNode('sleep')->defaultValue(0)->end()
8888
->end()
8989
->end()

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,25 +90,20 @@ public function load(array $configs, ContainerBuilder $container)
9090
}
9191
}
9292
$container->setParameter('swiftmailer.spool.enabled', isset($config['spool']));
93-
93+
9494
// antiflood?
9595
if (isset($config['antiflood'])) {
96-
foreach (array('treshold', 'sleep') as $key) {
97-
$container->setParameter('swiftmailer.antiflood.'.$key, $config['antiflood'][$key]);
98-
}
99-
96+
$container->setParameter('swiftmailer.plugin.antiflood.threshold', $config['antiflood']['threshold']);
97+
$container->setParameter('swiftmailer.plugin.antiflood.sleep', $config['antiflood']['sleep']);
98+
10099
$container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.antiflood')));
101-
} else {
102-
foreach (array('treshold', 'sleep') as $key) {
103-
$container->setParameter('swiftmailer.antiflood.'.$key, null);
104-
}
105100
}
106-
101+
107102
if ($config['logging']) {
108103
$container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger')));
109104
$container->findDefinition('swiftmailer.data_collector')->addTag('data_collector', array('template' => 'SwiftmailerBundle:Collector:swiftmailer', 'id' => 'swiftmailer'));
110105
}
111-
106+
112107
if (isset($config['sender_address']) && $config['sender_address']) {
113108
$container->setParameter('swiftmailer.sender_address', $config['sender_address']);
114109
$container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.impersonate')));

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<parameter key="swiftmailer.plugin.impersonate.class">Swift_Plugins_ImpersonatePlugin</parameter>
1818
<parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter>
1919
<parameter key="swiftmailer.plugin.antiflood.class">Swift_Plugins_AntiFloodPlugin</parameter>
20+
<parameter key="swiftmailer.plugin.antiflood.threshold">99</parameter>
21+
<parameter key="swiftmailer.plugin.antiflood.sleep">0</parameter>
2022

2123
<parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter>
2224
</parameters>
@@ -67,8 +69,8 @@
6769
<service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
6870

6971
<service id="swiftmailer.plugin.antiflood" class="%swiftmailer.plugin.antiflood.class%" public="false">
70-
<argument>%swiftmailer.antiflood.treshold%</argument>
71-
<argument>%swiftmailer.antiflood.sleep%</argument>
72+
<argument>%swiftmailer.plugin.antiflood.threshold%</argument>
73+
<argument>%swiftmailer.plugin.antiflood.sleep%</argument>
7274
</service>
7375

7476
<service id="swiftmailer.plugin.impersonate" class="%swiftmailer.plugin.impersonate.class%" public="false">

0 commit comments

Comments
 (0)
0