Skip to content

Commit 97c0aab

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Fixed invalid alias definition in "Deprecating Service Aliases" YAML example [Mailer] fix ses+smtp credentials format Remove SentMessage paragraph Update workflow.rst
2 parents 49cd53b + 337a76d commit 97c0aab

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

mailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ party provider:
158158
==================== ==================================================== =========================================== ========================================
159159
Provider SMTP HTTP API
160160
==================== ==================================================== =========================================== ========================================
161-
Amazon SES ses+smtp://ACCESS_KEY:SECRET_KEY@default ses+https://ACCESS_KEY:SECRET_KEY@default ses+api://ACCESS_KEY:SECRET_KEY@default
161+
Amazon SES ses+smtp://USERNAME:PASSWORD@default ses+https://ACCESS_KEY:SECRET_KEY@default ses+api://ACCESS_KEY:SECRET_KEY@default
162162
Google Gmail gmail+smtp://USERNAME:PASSWORD@default n/a n/a
163163
Mailchimp Mandrill mandrill+smtp://USERNAME:PASSWORD@default mandrill+https://KEY@default mandrill+api://KEY@default
164164
Mailgun mailgun+smtp://USERNAME:PASSWORD@default mailgun+https://KEY:DOMAIN@default mailgun+api://KEY:DOMAIN@default

notifier.rst

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ To send a notification, autowire the
397397
);
398398

399399
// Send the notification to the recipient
400-
$sentMessage = $notifier->send($notification, $recipient);
400+
$notifier->send($notification, $recipient);
401401

402402
// ...
403403
}
@@ -408,14 +408,6 @@ channels. The channels specify which channel (or transport) should be used
408408
to send the notification. For instance, ``['email', 'sms']`` will send
409409
both an email and sms notification to the user.
410410

411-
The ``send()`` method used to send the notification returns a variable of type
412-
:class:`Symfony\\Component\\Notifier\\Message\\SentMessage` which provides
413-
information such as the message ID and the original message contents.
414-
415-
.. versionadded:: 5.2
416-
417-
The ``SentMessage`` class was introduced in Symfony 5.2.
418-
419411
The default notification also has a ``content()`` and ``emoji()`` method to
420412
set the notification content and icon.
421413

service_container/alias_private.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ or you decided not to maintain it anymore), you can deprecate its definition:
172172
.. code-block:: yaml
173173
174174
app.mailer:
175-
alias: '@App\Mail\PhpMailer'
175+
alias: 'App\Mail\PhpMailer'
176176
177177
# this outputs the following generic deprecation message:
178178
# Since acme/package 1.2: The "app.mailer" service alias is deprecated. You should stop using it, as it will be removed in the future

workflow.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,8 @@ Accessing the Workflow in a Class
240240

241241
You can use the workflow inside a class by using
242242
:doc:`service autowiring </service_container/autowiring>` and using
243-
``camelCased workflow name + Workflow`` as parameter name::
243+
``camelCased workflow name + Workflow`` as parameter name. If it is a state
244+
machine type, use ``camelCased workflow name + StateMachine``::
244245

245246
use App\Entity\BlogPost;
246247
use Symfony\Component\Workflow\WorkflowInterface;

0 commit comments

Comments
 (0)