Merge remote branch 'arjenjb/swift-impersonate-plugin'
* arjenjb/swift-impersonate-plugin: Removed plugin from SF [SwiftmailerBundle] Added ImpersonateSenderPlugin
This commit is contained in:
commit
736c27e0c9
@ -80,6 +80,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
->scalarNode('path')->defaultValue('%kernel.cache_dir%/swiftmailer/spool')->end()
|
->scalarNode('path')->defaultValue('%kernel.cache_dir%/swiftmailer/spool')->end()
|
||||||
->end()
|
->end()
|
||||||
->end()
|
->end()
|
||||||
|
->scalarNode('sender_address')->end()
|
||||||
->scalarNode('delivery_address')->end()
|
->scalarNode('delivery_address')->end()
|
||||||
->booleanNode('disable_delivery')->end()
|
->booleanNode('disable_delivery')->end()
|
||||||
->booleanNode('logging')->defaultValue($this->debug)->end()
|
->booleanNode('logging')->defaultValue($this->debug)->end()
|
||||||
|
@ -95,6 +95,13 @@ class SwiftmailerExtension extends Extension
|
|||||||
$container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger')));
|
$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'));
|
$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')));
|
||||||
|
} else {
|
||||||
|
$container->setParameter('swiftmailer.sender_address', null);
|
||||||
|
}
|
||||||
|
|
||||||
if (isset($config['delivery_address']) && $config['delivery_address']) {
|
if (isset($config['delivery_address']) && $config['delivery_address']) {
|
||||||
$container->setParameter('swiftmailer.single_address', $config['delivery_address']);
|
$container->setParameter('swiftmailer.single_address', $config['delivery_address']);
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
<parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
|
<parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
|
||||||
<parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
|
<parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
|
||||||
|
<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.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter>
|
||||||
<parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter>
|
<parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter>
|
||||||
</parameters>
|
</parameters>
|
||||||
@ -63,6 +64,10 @@
|
|||||||
|
|
||||||
<service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
|
<service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
|
||||||
|
|
||||||
|
<service id="swiftmailer.plugin.impersonate" class="%swiftmailer.plugin.impersonate.class%" public="false">
|
||||||
|
<argument>%swiftmailer.sender_address%</argument>
|
||||||
|
</service>
|
||||||
|
|
||||||
<service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" />
|
<service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" />
|
||||||
|
|
||||||
<service id="swiftmailer.data_collector" class="%swiftmailer.data_collector.class%" public="false">
|
<service id="swiftmailer.data_collector" class="%swiftmailer.data_collector.class%" public="false">
|
||||||
|
Reference in New Issue
Block a user