Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3b90c98

Browse filesBrowse files
bug #31928 [FrameworkBundle] avoid service id conflicts with Swiftmailer (xabbuh)
This PR was merged into the 4.3 branch. Discussion ---------- [FrameworkBundle] avoid service id conflicts with Swiftmailer | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31906 | License | MIT | Doc PR | Commits ------- 5ce0ede avoid service id conflicts with Swiftmailer
2 parents 770162a + 5ce0ede commit 3b90c98
Copy full SHA for 3b90c98

File tree

Expand file treeCollapse file tree

2 files changed

+5
-5
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+5
-5
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
19161916
}
19171917

19181918
$loader->load('mailer.xml');
1919-
$container->getDefinition('mailer.transport')->setArgument(0, $config['dsn']);
1919+
$container->getDefinition('mailer.default_transport')->setArgument(0, $config['dsn']);
19201920
}
19211921

19221922
/**

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
<services>
88
<service id="mailer.mailer" class="Symfony\Component\Mailer\Mailer">
9-
<argument type="service" id="mailer.transport" />
9+
<argument type="service" id="mailer.default_transport" />
1010
<argument type="service" id="messenger.default_bus" on-invalid="ignore" />
1111
</service>
1212
<service id="mailer" alias="mailer.mailer" />
1313
<service id="Symfony\Component\Mailer\MailerInterface" alias="mailer.mailer" />
1414

15-
<service id="mailer.transport" class="Symfony\Component\Mailer\Transport\TransportInterface">
15+
<service id="mailer.default_transport" class="Symfony\Component\Mailer\Transport\TransportInterface">
1616
<factory class="Symfony\Component\Mailer\Transport" method="fromDsn" />
1717
<argument /> <!-- env(MAILER_DSN) -->
1818
<argument type="service" id="event_dispatcher" />
1919
<argument type="service" id="http_client" on-invalid="ignore" />
2020
<argument type="service" id="logger" on-invalid="ignore" />
2121
</service>
22-
<service id="Symfony\Component\Mailer\Transport\TransportInterface" alias="mailer.transport" />
22+
<service id="Symfony\Component\Mailer\Transport\TransportInterface" alias="mailer.default_transport" />
2323

2424
<service id="mailer.messenger.message_handler" class="Symfony\Component\Mailer\Messenger\MessageHandler">
25-
<argument type="service" id="mailer.transport" />
25+
<argument type="service" id="mailer.default_transport" />
2626
<tag name="messenger.message_handler" />
2727
</service>
2828
</services>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.