8000 Merge remote branch 'arjenjb/swift-impersonate-plugin' · DerekRoth/symfony@736c27e · GitHub
[go: up one dir, main page]
Skip to content

Commit 736c27e

Browse files
fabpotfabpot
committed
Merge remote branch 'arjenjb/swift-impersonate-plugin'
* arjenjb/swift-impersonate-plugin: Removed plugin from SF [SwiftmailerBundle] Added ImpersonateSenderPlugin
2 parents cb1f2c7 + df02c05 commit 736c27e

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public function getConfigTreeBuilder()
8080
->scalarNode('path')->defaultValue('%kernel.cache_dir%/swiftmailer/spool')->end()
8181
->end()
8282
->end()
83+
->scalarNode('sender_address')->end()
8384
->scalarNode('delivery_address')->end()
8485
->booleanNode('disable_delivery')->end()
8586
->booleanNode('logging')->defaultValue($this->debug)->end()

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ public function load(array $configs, ContainerBuilder $container)
9595
$container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger')));
9696
$container->findDefinition('swiftmailer.data_collector')->addTag('data_collector', array('template' => 'SwiftmailerBundle:Collector:swiftmailer', 'id' => 'swiftmailer'));
9797
}
98+
99+
if (isset($config['sender_address']) && $config['sender_address']) {
100+
$container->setParameter('swiftmailer.sender_address', $config['sender_address']);
101+
$container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.impersonate')));
102+
} else {
103+
$container->setParameter('swiftmailer.sender_address', null);
104+
}
98105

99106
if (isset($config['delivery_address']) && $config['delivery_address']) {
100107
$container->setParameter('swiftmailer.single_address', $config['delivery_address']);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
1616
<parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
17+
<parameter key="swiftmailer.plugin.impersonate.class">Swift_Plugins_ImpersonatePlugin</parameter>
1718
<parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter>
1819
<parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter>
1920
</parameters>
@@ -63,6 +64,10 @@
6364

6465
<service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
6566

67+
<service id="swiftmailer.plugin.impersonate" class="%swiftmailer.plugin.impersonate.class%" public="false">
68+
<argument>%swiftmailer.sender_address%</argument>
69+
</service>
70+
6671
<service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" />
6772

6873
<service id="swiftmailer.data_collector" class="%swiftmailer.data_collector.class%" public="false">

0 commit comments

Comments
 (0)
0