8000 bug #59855 [Mailer] Fix mailer signer configuration issues (eliasfern… · symfony/symfony@9a918ee · GitHub
[go: up one dir, main page]
Skip to content

Commit 9a918ee

Browse files
fabpotfabpot
committed
bug #59855 [Mailer] Fix mailer signer configuration issues (eliasfernandez)
This PR was merged into the 7.3 branch. Discussion ---------- [Mailer] Fix mailer signer configuration issues | Q | A | ------------- | --- | Branch? | 7.3 <!-- see below --> | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #59854 | License | MIT Explanation here: #59854 Commits ------- 3fa9b3e bug #59854 Fix mailer signer configuration issues
2 parents 0a10839 + 3fa9b3e commit 9a918ee

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2879,8 +2879,8 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
28792879
throw new LogicException('SMIME signed messages support cannot be enabled as this version of the Mailer component does not support it.');
28802880
}
28812881
$smimeSigner = $container->getDefinition('mailer.smime_signer');
2882-
$smimeSigner->setArgument(0, $config['smime_signer']['key']);
2883-
$smimeSigner->setArgument(1, $config['smime_signer']['certificate']);
2882+
$smimeSigner->setArgument(0, $config['smime_signer']['certificate']);
2883+
$smimeSigner->setArgument(1, $config['smime_signer']['key']);
28842884
$smimeSigner->setArgument(2, $config['smime_signer']['passphrase']);
28852885
$smimeSigner->setArgument(3, $config['smime_signer']['extra_certificates']);
28862886
$smimeSigner->setArgument(4, $config['smime_signer']['sign_options']);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595

9696
->set('mailer.smime_signer', SMimeSigner::class)
9797
->args([
98-
abstract_arg('key'),
9998
abstract_arg('certificate'),
99+
abstract_arg('key'),
100100
abstract_arg('passphrase'),
101101
abstract_arg('extraCertificates'),
102102
abstract_arg('signOptions'),
@@ -110,7 +110,7 @@
110110

111111
->set('mailer.dkim_signer.listener', DkimSignedMessageListener::class)
112112
->args([
113-
service(DkimSigner::class),
113+
service('mailer.dkim_signer'),
114114
])
115115
->tag('kernel.event_subscriber')
116116

0 commit comments

Comments
 (0)
0