Skip to content

Commit a5bbb55

Browse files
authored
Merge branch 'symfony:7.3' into mboelsterli-patch-1
2 parents 02a9c1c + 7cc8d25 commit a5bbb55

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: "Checkout"
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2525

2626
- name: "Set-up PHP"
2727
uses: shivammathur/setup-php@v2
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- name: "Checkout"
59-
uses: actions/checkout@v4
59+
uses: actions/checkout@v6
6060

6161
- name: "Create cache dir"
6262
run: mkdir .cache
@@ -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

@@ -85,7 +85,7 @@ jobs:
8585

8686
steps:
8787
- name: Checkout code
88-
uses: actions/checkout@v4
88+
uses: actions/checkout@v6
8989
with:
9090
path: 'docs'
9191

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ To do so, define a parameter with the same name as the env var using this syntax
734734
735735
.. tip::
736736

737-
Some hosts - like Platform.sh - offer easy `utilities to manage env vars`_
737+
Some hosts - like Upsun - offer easy `utilities to manage env vars`_
738738
in production.
739739

740740
.. note::

deployment.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Using Platforms as a Service
6161
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6262

6363
Using a Platform as a Service (PaaS) can be a great way to deploy your Symfony
64-
app quickly. There are many PaaS, but we recommend `Platform.sh`_ as it
64+
app quickly. There are many PaaS, but we recommend `Upsun`_ as it
6565
provides a dedicated Symfony integration and helps fund the Symfony development.
6666

6767
Using Build Scripts and other Tools
@@ -268,6 +268,6 @@ Learn More
268268
.. _`Symfony plugin`: https://github.com/capistrano/symfony/
269269
.. _`Deployer`: https://deployer.org/
270270
.. _`Git Tagging`: https://git-scm.com/book/en/v2/Git-Basics-Tagging
271-
.. _`Platform.sh`: https://symfony.com/cloud
271+
.. _`Upsun`: https://symfony.com/cloud
272272
.. _`Symfony CLI`: https://symfony.com/download
273273
.. _`symfony/apache-pack`: https://packagist.org/packages/symfony/apache-pack

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

service_container/autowiring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ by using the property name as method name::
796796

797797
.. versionadded:: 7.1
798798

799-
The :class:`Symfony\Component\DependencyInjection\Attribute\\AutowireMethodOf`
799+
The :class:`Symfony\\Component\\DependencyInjection\\Attribute\\AutowireMethodOf`
800800
attribute was introduced in Symfony 7.1.
801801

802802
.. _autowiring-calls:

setup/bundles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ as a starting point for your own GitHub CI configuration:
126126
runs-on: ubuntu-latest
127127
continue-on-error: ${{ matrix.stability == 'dev' }}
128128
steps:
129-
- uses: actions/checkout@v5
129+
- uses: actions/checkout@v6
130130
131131
- name: Setup PHP, with composer and extensions
132132
uses: shivammathur/setup-php@v2

setup/symfony_cli.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,11 +598,11 @@ Symfony Cloud Integration
598598
-------------------------
599599

600600
The Symfony CLI provides seamless integration with `Symfony Cloud`_ (powered by
601-
`Platform.sh`_):
601+
`Upsun`_):
602602

603603
.. code-block:: terminal
604604
605-
# open Platform.sh web UI
605+
# open Upsun web UI
606606
$ symfony cloud:web
607607
608608
# deploy your project to production
@@ -647,8 +647,8 @@ variables are properly exposed:
647647
.. _`symfony.com/download`: https://symfony.com/download
648648
.. _`Docker`: https://en.wikipedia.org/wiki/Docker_(software)
649649
.. _`Symfony Cloud`: https://symfony.com/cloud/
650-
.. _`Platform.sh`: https://platform.sh/
651-
.. _`Symfony Cloud documentation`: https://docs.platform.sh/frameworks/symfony.html
650+
.. _`Upsun`: https://upsun.com/
651+
.. _`Symfony Cloud documentation`: https://docs.upsun.com/get-started/stacks/symfony/integration.html
652652
.. _`Proxy settings in Windows`: https://www.dummies.com/computers/operating-systems/windows-10/how-to-set-up-a-proxy-in-windows-10/
653653
.. _`Proxy settings in macOS`: https://support.apple.com/guide/mac-help/enter-proxy-server-settings-on-mac-mchlp2591/mac
654654
.. _`Proxy settings in Ubuntu`: https://help.ubuntu.com/stable/ubuntu-help/net-proxy.html.en

0 commit comments

Comments
 (0)