8000 Merge branch '6.4' into 7.1 · symfony/symfony-docs@70038a8 · GitHub
[go: up one dir, main page]
Skip to content
Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 70038a8

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '6.4' into 7.1
* 6.4: Fix minor syntax issues
2 parents d10f5bc + 30c74fd commit 70038a8

File tree

8 files changed

+45
-47
lines changed

8 files changed

+45
-47
lines changed

‎configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ a new ``locale`` parameter is added to the ``config/services.yaml`` file).
379379

380380
By convention, parameters whose names start with a dot ``.`` (for example,
381381
``.mailer.transport``), are available only during the container compilation.
382-
They are useful when working with :ref:`Compiler Passes </service_container/compiler_passes>`
382+
They are useful when working with :doc:`Compiler Passes </service_container/compiler_passes>`
383383
to declare some temporary parameters that won't be available later in the application.
384384

385385
.. seealso::

‎messenger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ Rate Limited Transport
903903
~~~~~~~~~~~~~~~~~~~~~~
904904

905905
Sometimes you might need to rate limit your message worker. You can configure a
906-
rate limiter on a transport (requires the :doc:`RateLimiter component </rate-limiter>`)
906+
rate limiter on a transport (requires the :doc:`RateLimiter component </rate_limiter>`)
907907
by setting its ``rate_limiter`` option:
908908

909909
.. configuration-block::

‎reference/attributes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Dependency Injection
3333
* :ref:`Autowire <autowire-attribute>`
3434
* :ref:`AutowireCallable <autowiring_closures>`
3535
* :doc:`AutowireDecorated </service_container/service_decoration>`
36-
* :doc:`AutowireIterator <service-locator_autowire-iterator>`
36+
* :ref:`AutowireIterator <service-locator_autowire-iterator>`
3737
* :ref:`AutowireLocator <service-locator_autowire-locator>`
3838
* :ref:`AutowireMethodOf <autowiring_closures>`
3939
* :ref:`AutowireServiceClosure <autowiring_closures>`

‎reference/configuration/framework.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,6 @@ named ``kernel.http_method_override``.
193193
$request = Request::createFromGlobals();
194194
// ...
195195

196-
.. _configuration-framework-http_method_override:
197-
198196
trust_x_sendfile_type_header
199197
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
200198

‎reference/constraints/Callback.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,16 @@ callback method:
271271
* A closure.
272272

273273
Concrete callbacks receive an :class:`Symfony\\Component\\Validator\\Context\\ExecutionContextInterface`
274-
instance as the first argument and the :ref:`payload option <reference-constraints-payload>`
274+
instance as the first argument and the :ref:`payload option <reference-constraints-callback-payload>`
275275
as the second argument.
276276

277277
Static or closure callbacks receive the validated object as the first argument,
278278
the :class:`Symfony\\Component\\Validator\\Context\\ExecutionContextInterface`
279-
instance as the second argument and the :ref:`payload option <reference-constraints-payload>`
279+
instance as the second argument and the :ref:`payload option <reference-constraints-callback-payload>`
280280
as the third argument.
281281

282282
.. include:: /reference/constraints/_groups-option.rst.inc
283283

284+
.. _reference-constraints-callback-payload:
285+
284286
.. include:: /reference/constraints/_payload-option.rst.inc

‎reference/constraints/_payload-option.rst.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
.. _reference-constraints-payload:
2-
31
``payload``
42
~~~~~~~~~~~
53

‎reference/dic_tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ controller.argument_value_resolver
335335
Value resolvers implement the
336336
:class:`Symfony\\Component\\HttpKernel\\Controller\\ValueResolverInterface`
337337
and are used to resolve argument values for controllers as described here:
338-
:doc:`/controller/argument_value_resolver`.
338+
:doc:`/controller/value_resolver`.
339339

340340
data_collector
341341
--------------

‎service_container/service_decoration.rst

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -289,35 +289,35 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
289289

290290
.. configuration-block::
291291

292-
.. code-block:: php-attributes
292+
.. code-block:: php-attributes
293293
294-
// ...
295-
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
296-
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
294+
// ...
295+
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
296+
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
297297
298-
#[AsDecorator(decorates: Foo::class, priority: 5)]
299-
class Bar
300-
{
301-
public function __construct(
302-
#[AutowireDecorated]
303-
private $inner,
304-
) {
305-
}
306-
// ...
298+
#[AsDecorator(decorates: Foo::class, priority: 5)]
299+
class Bar
300+
{
301+
public function __construct(
302+
#[AutowireDecorated]
303+
private $inner,
304+
) {
307305
}
306+
// ...
307+
}
308308
309-
#[AsDecorator(decorates: Foo::class, priority: 1)]
310-
class Baz
311-
{
312-
public function __construct(
313-
#[AutowireDecorated]
314-
private $inner,
315-
) {
316-
}
317-
318-
// ...
309+
#[AsDecorator(decorates: Foo::class, priority: 1)]
310+
class Baz
311+
{
312+
public function __construct(
313+
#[AutowireDecorated]
314+
private $inner,
315+
) {
319316
}
320317
318+
// ...
319+
}
320+
321321
.. code-block:: yaml
322322
323323
# config/services.yaml
@@ -609,24 +609,24 @@ Three different behaviors are available:
609609

610610
.. configuration-block::
611611

612-
.. code-block:: php-attributes
613-
614-
// ...
615-
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
616-
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
617-
use Symfony\Component\DependencyInjection\ContainerInterface;
612+
.. code-block:: php-attributes
618613
619-
#[AsDecorator(decorates: Mailer::class, onInvalid: ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]
620-
class Bar
621-
{
622-
public function __construct(
623-
#[AutowireDecorated] private $inner,
624-
) {
625-
}
614+
// ...
615+
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
616+
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
617+
use Symfony\Component\DependencyInjection\ContainerInterface;
626618
627-
// ...
619+
#[AsDecorator(decorates: Mailer::class, onInvalid: ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]
620+
class Bar
621+
{
622+
public function __construct(
623+
#[AutowireDecorated] private $inner,
624+
) {
628625
}
629626
627+
// ...
628+
}
629+
630630
.. code-block:: yaml
631631
632632
# config/services.yaml

0 commit comments

Comments
 (0)
0