diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid service id conflicts with Swiftmailer

Browse Source
This commit is contained in:
Christian Flothmann 2019-06-07 12:57:51 +02:00
parent 5c7b4a0fef
commit 5ce0edeb12
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -1916,7 +1916,7 @@ class FrameworkExtension extends Extension
} }
$loader->load('mailer.xml'); $loader->load('mailer.xml');
$container->getDefinition('mailer.transport')->setArgument(0, $config['dsn']); $container->getDefinition('mailer.default_transport')->setArgument(0, $config['dsn']);
} }
/** /**

8
src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml
View File

@ -6,23 +6,23 @@
<services> <services>
<service id="mailer.mailer" class="Symfony\Component\Mailer\Mailer"> <service id="mailer.mailer" class="Symfony\Component\Mailer\Mailer">
<argument type="service" id="mailer.transport" /> <argument type="service" id="mailer.default_transport" />
<argument type="service" id="messenger.default_bus" on-invalid="ignore" /> <argument type="service" id="messenger.default_bus" on-invalid="ignore" />
</service> </service>
<service id="mailer" alias="mailer.mailer" /> <service id="mailer" alias="mailer.mailer" />
<service id="Symfony\Component\Mailer\MailerInterface" alias="mailer.mailer" /> <service id="Symfony\Component\Mailer\MailerInterface" alias="mailer.mailer" />
<service id="mailer.transport" class="Symfony\Component\Mailer\Transport\TransportInterface"> <service id="mailer.default_transport" class="Symfony\Component\Mailer\Transport\TransportInterface">
<factory class="Symfony\Component\Mailer\Transport" method="fromDsn" /> <factory class="Symfony\Component\Mailer\Transport" method="fromDsn" />
<argument /> <!-- env(MAILER_DSN) --> <argument /> <!-- env(MAILER_DSN) -->
<argument type="service" id="event_dispatcher" /> <argument type="service" id="event_dispatcher" />
<argument type="service" id="http_client" on-invalid="ignore" /> <argument type="service" id="http_client" on-invalid="ignore" />
<argument type="service" id="logger" on-invalid="ignore" /> <argument type="service" id="logger" on-invalid="ignore" />
</service> </service>
<service id="Symfony\Component\Mailer\Transport\TransportInterface" alias="mailer.transport" /> <service id="Symfony\Component\Mailer\Transport\TransportInterface" alias="mailer.default_transport" />
<service id="mailer.messenger.message_handler" class="Symfony\Component\Mailer\Messenger\MessageHandler"> <service id="mailer.messenger.message_handler" class="Symfony\Component\Mailer\Messenger\MessageHandler">
<argument type="service" id="mailer.transport" /> <argument type="service" id="mailer.default_transport" />
<tag name="messenger.message_handler" /> <tag name="messenger.message_handler" />
</service> </service>
</services> </services>