Skip to content

Commit d25e0c2

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [PHPUnitBridge] [PHPUnit Bridge] Fix @-silencing operator link [Testing] Fix grammar issue Typo
2 parents a1f373d + 0d9e4dc commit d25e0c2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ message contains the ``"foobar"`` string.
222222
Making Tests Fail
223223
~~~~~~~~~~~~~~~~~
224224

225-
By default, any non-legacy-tagged or any non-`@-silenced <@-silencing operator>`_
225+
By default, any non-legacy-tagged or any non-silenced (`@-silencing operator`_)
226226
deprecation notices will make tests fail. Alternatively, you can configure
227227
an arbitrary threshold by setting ``SYMFONY_DEPRECATIONS_HELPER`` to
228228
``max[total]=320`` for instance. It will make the tests fail only if a

form/bootstrap5.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ If you prefer to apply the Bootstrap styles on a form to form basis, include the
8686
Error Messages
8787
--------------
8888

89-
Unlike the :doc:`Bootstrap 4 theme </form/bootstrap4>`, errors are rendered
89+
Unlike in the :doc:`Bootstrap 4 theme </form/bootstrap4>`, errors are rendered
9090
**after** the ``input`` element. However, this still makes a strong connection
9191
between the error and its ``<input>``, as required by the `WCAG 2.0 standard`_.
9292

testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ stores in the session of the test client.
629629
Making AJAX Requests
630630
....................
631631

632-
The client provides a
632+
The client provides an
633633
:method:`Symfony\\Component\\BrowserKit\\AbstractBrowser::xmlHttpRequest`
634634
method, which has the same arguments as the ``request()`` method and is
635635
a shortcut to make AJAX requests::

0 commit comments

Comments
 (0)