Skip to content

Commit 8d05e46

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Fix broken class links Add return to non-symfony VarDumper::setHandler
2 parents dc26cf2 + e2d2d40 commit 8d05e46

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

components/runtime.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ The following arguments are supported by the ``SymfonyRuntime``:
136136
:class:`Symfony\\Component\\Console\\Application`
137137
An application for creating CLI applications.
138138

139-
:class:`Symfony\\Component\\Command\\Command`
139+
:class:`Symfony\\Component\\Console\\Command\\Command`
140140
For creating one line command CLI applications (using
141141
``Command::setCode()``).
142142

components/validator/resources.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ instance.
133133

134134
To solve this problem, call the :method:`Symfony\\Component\\Validator\\ValidatorBuilder::setMappingCache`
135135
method of the Validator builder and pass your own caching class (which must
136-
implement the PSR-6 interface :class:`Psr\\Cache\\CacheItemPoolInterface`)::
136+
implement the PSR-6 interface ``Psr\Cache\CacheItemPoolInterface``)::
137137

138138
use Symfony\Component\Validator\Validation;
139139

components/var_dumper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Outside a Symfony application, use the :class:`Symfony\\Component\\VarDumper\\Du
170170
]);
171171

172172
VarDumper::setHandler(function (mixed $var) use ($cloner, $dumper): ?string {
173-
$dumper->dump($cloner->cloneVar($var));
173+
return $dumper->dump($cloner->cloneVar($var));
174174
});
175175

176176
.. note::

reference/constraints/Negative.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ want to allow zero as value.
88
========== ===================================================================
99
Applies to :ref:`property or method <validation-property-target>`
1010
Class :class:`Symfony\\Component\\Validator\\Constraints\\Negative`
11-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\LesserThanValidator`
11+
Validator :class:`Symfony\\Component\\Validator\\Constraints\\LessThanValidator`
1212
========== ===================================================================
1313

1414
Basic Usage

reference/constraints/NegativeOrZero.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ want to allow zero as value, use :doc:`/reference/constraints/Negative` instead.
77
========== ===================================================================
88
Applies to :ref:`property or method <validation-property-target>`
99
Class :class:`Symfony\\Component\\Validator\\Constraints\\NegativeOrZero`
10-
Validator :class:`Symfony\\Component\\Validator\\Constraints\\LesserThanOrEqualValidator`
10+
Validator :class:`Symfony\\Component\\Validator\\Constraints\\LessThanOrEqualValidator`
1111
========== ===================================================================
1212

1313
Basic Usage

reference/dic_tags.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,8 +1307,7 @@ twig.loader
13071307

13081308
**Purpose**: Register a custom service that loads Twig templates
13091309

1310-
By default, Symfony uses only one `Twig Loader`_ -
1311-
:class:`Symfony\\Bundle\\TwigBundle\\Loader\\FilesystemLoader`. If you need
1310+
By default, Symfony uses only one `Twig Loader`_ - `FilesystemLoader`_. If you need
13121311
to load Twig templates from another resource, you can create a service for
13131312
the new loader and tag it with ``twig.loader``.
13141313

@@ -1425,6 +1424,7 @@ Then, tag it with the ``validator.initializer`` tag (it has no options).
14251424
For an example, see the ``DoctrineInitializer`` class inside the Doctrine
14261425
Bridge.
14271426

1427+
.. _`FilesystemLoader`: https://github.com/twigphp/Twig/blob/3.x/src/Loader/FilesystemLoader.php
14281428
.. _`Twig's documentation`: https://twig.symfony.com/doc/3.x/advanced.html#creating-an-extension
14291429
.. _`Twig Loader`: https://twig.symfony.com/doc/3.x/api.html#loaders
14301430
.. _`PHP class preloading`: https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.preload

templates.rst

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ Rendering a Template in Services
638638
Inject the ``twig`` Symfony service into your own services and use its
639639
``render()`` method. When using :doc:`service autowiring </service_container/autowiring>`
640640
you only need to add an argument in the service constructor and type-hint it with
641-
the :class:`Twig\\Environment` class::
641+
the `Twig Environment`_::
642642

643643
// src/Service/SomeService.php
644644
namespace App\Service;
@@ -1620,24 +1620,25 @@ If you're using the default ``services.yaml`` configuration, this will already
16201620
work! Otherwise, :ref:`create a service <service-container-creating-service>`
16211621
for this class and :doc:`tag your service </service_container/tags>` with ``twig.runtime``.
16221622

1623-
.. _`Twig`: https://twig.symfony.com
1624-
.. _`tags`: https://twig.symfony.com/doc/3.x/tags/index.html
1623+
.. _`Cross-Site Scripting`: https://en.wikipedia.org/wiki/Cross-site_scripting
1624+
.. _`default Twig filters and functions`: https://twig.symfony.com/doc/3.x/#reference
16251625
.. _`filters`: https://twig.symfony.com/doc/3.x/filters/index.html
16261626
.. _`functions`: https://twig.symfony.com/doc/3.x/functions/index.html
1627-
.. _`with_context`: https://twig.symfony.com/doc/3.x/functions/include.html
1628-
.. _`Twig template loader`: https://twig.symfony.com/doc/3.x/api.html#loaders
1629-
.. _`Twig raw filter`: https://twig.symfony.com/doc/3.x/filters/raw.html
1630-
.. _`Twig output escaping docs`: https://twig.symfony.com/doc/3.x/api.html#escaper-extension
1631-
.. _`snake case`: https://en.wikipedia.org/wiki/Snake_case
1632-
.. _`Twig template inheritance`: https://twig.symfony.com/doc/3.x/tags/extends.html
1633-
.. _`Twig block tag`: https://twig.symfony.com/doc/3.x/tags/block.html
1634-
.. _`Cross-Site Scripting`: https://en.wikipedia.org/wiki/Cross-site_scripting
16351627
.. _`GitHub Actions`: https://docs.github.com/en/free-pro-team@latest/actions
1636-
.. _`UX Twig Component`: https://symfony.com/bundles/ux-twig-component/current/index.html
1637-
.. _`UX Live Component`: https://symfony.com/bundles/ux-live-component/current/index.html
1638-
.. _`Twig Extensions`: https://twig.symfony.com/doc/3.x/advanced.html#creating-an-extension
1639-
.. _`default Twig filters and functions`: https://twig.symfony.com/doc/3.x/#reference
1640-
.. _`official Twig extensions`: https://github.com/twigphp?q=extra
16411628
.. _`global variables`: https://twig.symfony.com/doc/3.x/advanced.html#id1
16421629
.. _`hinclude.js`: https://mnot.github.io/hinclude/
16431630
.. _`Turbo Streams`: https://symfony.com/bundles/ux-turbo/current/index.html
1631+
.. _`official Twig extensions`: https://github.com/twigphp?q=extra
1632+
.. _`snake case`: https://en.wikipedia.org/wiki/Snake_case
1633+
.. _`tags`: https://twig.symfony.com/doc/3.x/tags/index.html
1634+
.. _`Twig block tag`: https://twig.symfony.com/doc/3.x/tags/block.html
1635+
.. _`Twig Environment`: https://github.com/twigphp/Twig/blob/3.x/src/Loader/FilesystemLoader.php
1636+
.. _`Twig Extensions`: https://twig.symfony.com/doc/3.x/advanced.html#creating-an-extension
1637+
.. _`Twig output escaping docs`: https://twig.symfony.com/doc/3.x/api.html#escaper-extension
1638+
.. _`Twig raw filter`: https://twig.symfony.com/doc/3.x/filters/raw.html
1639+
.. _`Twig template inheritance`: https://twig.symfony.com/doc/3.x/tags/extends.html
1640+
.. _`Twig template loader`: https://twig.symfony.com/doc/3.x/api.html#loaders
1641+
.. _`Twig`: https://twig.symfony.com
1642+
.. _`UX Live Component`: https://symfony.com/bundles/ux-live-component/current/index.html
1643+
.. _`UX Twig Component`: https://symfony.com/bundles/ux-twig-component/current/index.html
1644+
.. _`with_context`: https://twig.symfony.com/doc/3.x/functions/include.html

0 commit comments

Comments
 (0)