Skip to content

Commit 687605e

Browse files
committed
Merge branch '6.4' into 7.3
* 6.4: Use oskarstark/doctor-rst:1.70.2
2 parents 304c77a + 9aa14a5 commit 687605e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
7373

7474
- name: "Run DOCtor-RST"
75-
uses: docker://oskarstark/doctor-rst:1.70.1
75+
uses: docker://oskarstark/doctor-rst:1.70.2
7676
with:
7777
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
7878

mailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1975,7 +1975,7 @@ SentMessageEvent
19751975

19761976
**Event Class**: :class:`Symfony\\Component\\Mailer\\Event\\SentMessageEvent`
19771977

1978-
``SentMessageEvent`` allows you to act on the :class:`Symfony\\Component\\\Mailer\\\SentMessage`
1978+
``SentMessageEvent`` allows you to act on the :class:`Symfony\\Component\\Mailer\\SentMessage`
19791979
class to access the original message (``getOriginalMessage()``) and some
19801980
:ref:`debugging information <mailer-debugging-emails>` (``getDebug()``) such as
19811981
the HTTP calls made by the HTTP transports, which is useful for debugging errors::

scheduler.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -566,22 +566,22 @@ schedule and consider all changes in real-time.
566566
Strategies for Adding, Removing, and Modifying Entries within the Schedule
567567
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
568568

569-
The schedule provides you with the ability to :method:`Symfony\\Component\\Scheduler\Schedule::add`,
570-
:method:`Symfony\\Component\\Scheduler\Schedule::remove`, or :method:`Symfony\\Component\\Scheduler\Schedule::clear`
569+
The schedule provides you with the ability to :method:`Symfony\\Component\\Scheduler\\Schedule::add`,
570+
:method:`Symfony\\Component\\Scheduler\\Schedule::remove`, or :method:`Symfony\\Component\\Scheduler\\Schedule::clear`
571571
all associated recurring messages, resulting in the reset and recalculation of
572572
the in-memory stack of recurring messages.
573573

574574
For instance, for various reasons, if there's no need to generate a report, a
575575
callback can be employed to conditionally skip generating of some or all reports.
576576

577577
However, if the intention is to completely remove a recurring message and its recurrence,
578-
the :class:`Symfony\\Component\\Scheduler\Schedule` offers a :method:`Symfony\\Component\\Scheduler\Schedule::remove`
579-
or a :method:`Symfony\\Component\\Scheduler\Schedule::removeById` method. This can
578+
the :class:`Symfony\\Component\\Scheduler\\Schedule` offers a :method:`Symfony\\Component\\Scheduler\\Schedule::remove`
579+
or a :method:`Symfony\\Component\\Scheduler\\Schedule::removeById` method. This can
580580
be particularly useful in your case, especially if you need to halt the generation
581581
of the recurring message, which involves deleting old reports.
582582

583583
In your handler, you can check a condition and, if affirmative, access the
584-
:class:`Symfony\\Component\\Scheduler\Schedule` and invoke this method::
584+
:class:`Symfony\\Component\\Scheduler\\Schedule` and invoke this method::
585585

586586
// src/Scheduler/SaleTaskProvider.php
587587
namespace App\Scheduler;

security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ Form Login
711711

712712
Most websites have a login form where users authenticate using an
713713
identifier (e.g. email address or username) and a password. This
714-
functionality is provided by the built-in :class:`Symfony\\Component\\Security\\Http\Authenticator\\FormLoginAuthenticator`.
714+
functionality is provided by the built-in :class:`Symfony\\Component\\Security\\Http\\Authenticator\\FormLoginAuthenticator`.
715715

716716
You can run the following command to create everything needed to add a login
717717
form in your application:
@@ -2714,7 +2714,7 @@ anonymous users access by checking if there is no user set on the token::
27142714
}
27152715

27162716
.. versionadded:: 7.3
2717-
2717+
27182718
The ``$vote`` argument of the ``voteOnAttribute()`` method was introduced
27192719
in Symfony 7.3.
27202720

security/voters.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ Custom Access Decision Strategy
468468

469469
If none of the built-in strategies fits your use case, define the ``strategy_service``
470470
option to use a custom service (your service must implement the
471-
:class:`Symfony\\Component\\Security\\Core\Authorization\\Strategy\\AccessDecisionStrategyInterface`):
471+
:class:`Symfony\\Component\\Security\\Core\\Authorization\\Strategy\\AccessDecisionStrategyInterface`):
472472

473473
.. configuration-block::
474474

0 commit comments

Comments
 (0)