8000 bug #59854 Fix mailer signer configuration issues · symfony/symfony@4f7e469 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4f7e469

Browse files
eliasfernandezeliasfernandez
committed
bug #59854 Fix mailer signer configuration issues
1 parent c715827 commit 4f7e469

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,13 +2291,13 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
22912291
->canBeEnabled()
22922292
->info('S/MIME signer configuration')
22932293
->children()
2294-
->scalarNode('key')
2295-
->info('Path to key (in PEM format)')
2294+
->scalarNode('certificate')
2295+
->info('Path to certificate (in PEM format without the `file://` prefix)')
22962296
->defaultValue('')
22972297
->cannotBeEmpty()
22982298
->end()
2299-
->scalarNode('certificate')
2300-
->info('Path to certificate (in PEM format without the `file://` prefix)')
2299+
->scalarNode('key')
2300+
->info('Path to key (in PEM format)')
23012301
->defaultValue('')
23022302
->cannotBeEmpty()
23032303
->end()

‎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

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,8 @@
828828
</xsd:complexType>
829829

830830
<xsd:complexType name="mailer_smime_signer">
831-
<xsd:attribute name="key" type="xsd:string"/>
832831
<xsd:attribute name="certificate" type="xsd:string"/>
832+
<xsd:attribute name="key" type="xsd:string"/>
833833
<xsd:attribute name="passphrase" type="xsd:string" />
834834
<xsd:attribute name="extraCertificates" type="xsd:string" />
835835
<xsd:attribute name="signOptions" type="xsd:integer" />

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,8 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
933933
],
934934
'smime_signer' => [
935935
'enabled' => false,
936-
'key' => '',
937936
'certificate' => '',
937+
'key' => '',
938938
'passphrase' => null,
939939
'extra_certificates' => null,
940940
'sign_options' => null,

0 commit comments

Comments
 30BF  (0)
0