Skip to content

Commit 92f1c4d

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: fix: minor in file `webhook.rst` Fix yaml and xml example syntax error at factories.rst
2 parents 1538584 + a7c87ad commit 92f1c4d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

service_container/factories.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ e.g. change the service based on a parameter:
389389
390390
# you can use the arg() function to retrieve an argument from the definition
391391
App\Email\NewsletterManagerInterface:
392-
factory: "@=arg(0).createNewsletterManager() ?: service("default_newsletter_manager")"
392+
factory: '@=arg(0).createNewsletterManager() ?: service("default_newsletter_manager")'
393393
arguments:
394394
- '@App\Email\NewsletterManagerFactory'
395395
@@ -410,7 +410,7 @@ e.g. change the service based on a parameter:
410410
411411
<!-- you can use the arg() function to retrieve an argument from the definition -->
412412
<service id="App\Email\NewsletterManagerInterface">
413-
<factory expression="arg(0).createNewsletterManager() ?: service("default_newsletter_manager")"/>
413+
<factory expression="arg(0).createNewsletterManager() ?: service('default_newsletter_manager')"/>
414414
<argument type="service" id="App\Email\NewsletterManagerFactory"/>
415415
</service>
416416
</services>

webhook.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ webhook consumer code.
112112
The webhook routing name is part of the URL you need to configure at the
113113
third-party mailer provider. The URL is the concatenation of your domain name
114114
and the routing name you chose in the configuration (like
115-
``https://example.com/webhook/mailer_mailgun``.
115+
``https://example.com/webhook/mailer_mailgun``).
116116

117117
For Mailgun, you will get a secret for the webhook. Store this secret as
118118
MAILER_MAILGUN_SECRET (in the :doc:`secrets management system

0 commit comments

Comments
 (0)