Skip to content

Commit d30c9fe

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Use Doctor RST 1.41.0 and new rule `TitleUnderlineLengthMustMatchTitleLength`
2 parents b2f258a + 08e6ad8 commit d30c9fe

File tree

15 files changed

+16
-15
lines changed

15 files changed

+16
-15
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ rules:
4747
space_between_label_and_link_in_doc: ~
4848
space_between_label_and_link_in_ref: ~
4949
string_replacement: ~
50+
title_underline_length_must_match_title_length: ~
5051
typo: ~
5152
unused_links: ~
5253
use_deprecated_directive_instead_of_versionadded: ~

.github/workflows/ci.yaml

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

7575
- name: "Run DOCtor-RST"
76-
uses: docker://oskarstark/doctor-rst:1.40.1
76+
uses: docker://oskarstark/doctor-rst:1.41.0
7777
with:
7878
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
7979

best_practices.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ important parts of your application.
229229
.. _best-practice-controller-annotations:
230230

231231
Use Attributes or Annotations to Configure Routing, Caching, and Security
232-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
232+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
233233

234234
Using attributes or annotations for routing, caching, and security simplifies
235235
configuration. You don't need to browse several files created with different
@@ -437,7 +437,7 @@ specific tests for each page.
437437
.. _hardcode-urls-in-a-functional-test:
438438

439439
Hard-code URLs in a Functional Test
440-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
440+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
441441

442442
In Symfony applications, it's recommended to :ref:`generate URLs <routing-generating-urls>`
443443
using routes to automatically update all links when a URL changes. However, if a

components/lock.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ method can be safely called repeatedly, even if the lock is already acquired.
7070
third argument of the ``createLock()`` method to ``false``.
7171

7272
Serializing Locks
73-
------------------
73+
-----------------
7474

7575
The :class:`Symfony\\Component\\Lock\\Key` contains the state of the
7676
:class:`Symfony\\Component\\Lock\\Lock` and can be serialized. This

components/runtime.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
single: Components; Runtime
44

55
The Runtime Component
6-
======================
6+
=====================
77

88
The Runtime Component decouples the bootstrapping logic from any global state
99
to make sure the application can run with runtimes like PHP-PM, ReactPHP,

components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ context to pass in these options using the key ``json_encode_options`` or
10001000
$this->serializer->serialize($data, 'json', ['json_encode_options' => \JSON_PRESERVE_ZERO_FRACTION]);
10011001

10021002
The ``CsvEncoder``
1003-
~~~~~~~~~~~~~~~~~~~
1003+
~~~~~~~~~~~~~~~~~~
10041004

10051005
The ``CsvEncoder`` encodes to and decodes from CSV.
10061006

controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ to render the content of a page.
1919
single: Controller; Basic example
2020

2121
A Basic Controller
22-
-------------------
22+
------------------
2323

2424
While a controller can be any PHP callable (function, method on an object,
2525
or a ``Closure``), a controller is usually a method inside a controller

frontend/encore/bootstrap.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Now, require bootstrap from any of your JavaScript files:
7474
});
7575
7676
Using Bootstrap with Turbo
77-
---------------------------
77+
--------------------------
7878

7979
If you are using bootstrap with Turbo Drive, to allow your JavaScript to load on each page change,
8080
wrap the initialization in a ``turbo:load`` event listener:

frontend/encore/virtual-machine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ connections:
9393
otherwise other computers can have access to it.
9494

9595
Fix "Invalid Host header" Issue
96-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
96+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9797

9898
Webpack will respond ``Invalid Host header`` when trying to access files from
9999
the dev-server. To fix this, set the ``allowedHosts`` option:

mercure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ Checkout `the dedicated API Platform documentation`_ to learn more about
614614
its Mercure support.
615615

616616
Testing
617-
--------
617+
-------
618618

619619
During unit testing it's usually not needed to send updates to Mercure.
620620

0 commit comments

Comments
 (0)