Skip to content

Commit

Permalink
minor symfony#20427 Fix minor syntax issues (wouterj)
Browse files Browse the repository at this point in the history
This PR was merged into the 6.4 branch.

Discussion
----------

Fix minor syntax issues

Issues found while building the docs with Guides.

Commits
-------

f6a61f9 Fix minor syntax issues
  • Loading branch information
javiereguiluz committed Dec 2, 2024
2 parents f0bcff3 + f6a61f9 commit 30c74fd
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 47 deletions.
2 changes: 1 addition & 1 deletion configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ a new ``locale`` parameter is added to the ``config/services.yaml`` file).

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

.. versionadded:: 6.3
Expand Down
2 changes: 1 addition & 1 deletion messenger.rst
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ Rate Limited Transport
The ``rate_limiter`` option was introduced in Symfony 6.2.

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

.. configuration-block::
Expand Down
2 changes: 1 addition & 1 deletion reference/attributes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Dependency Injection
* :ref:`Autowire <autowire-attribute>`
* :ref:`AutowireCallable <autowiring_closures>`
* :doc:`AutowireDecorated </service_container/service_decoration>`
* :doc:`AutowireIterator <service-locator_autowire-iterator>`
* :ref:`AutowireIterator <service-locator_autowire-iterator>`
* :ref:`AutowireLocator <service-locator_autowire-locator>`
* :ref:`AutowireServiceClosure <autowiring_closures>`
* :ref:`Exclude <service-psr4-loader>`
Expand Down
2 changes: 0 additions & 2 deletions reference/configuration/framework.rst
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,6 @@ The **default value** is:
$request = Request::createFromGlobals();
// ...

.. _configuration-framework-http_method_override:

trust_x_sendfile_type_header
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
6 changes: 4 additions & 2 deletions reference/constraints/Callback.rst
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,16 @@ callback method:
* A closure.

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

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

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

.. _reference-constraints-callback-payload:

.. include:: /reference/constraints/_payload-option.rst.inc
2 changes: 0 additions & 2 deletions reference/constraints/_payload-option.rst.inc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.. _reference-constraints-payload:

``payload``
~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion reference/dic_tags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ controller.argument_value_resolver
Value resolvers implement the
:class:`Symfony\\Component\\HttpKernel\\Controller\\ValueResolverInterface`
and are used to resolve argument values for controllers as described here:
:doc:`/controller/argument_value_resolver`.
:doc:`/controller/value_resolver`.

.. versionadded:: 6.2

Expand Down
74 changes: 37 additions & 37 deletions service_container/service_decoration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -299,35 +299,35 @@ the ``decoration_priority`` option. Its value is an integer that defaults to

.. configuration-block::

.. code-block:: php-attributes
.. code-block:: php-attributes
// ...
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
// ...
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
#[AsDecorator(decorates: Foo::class, priority: 5)]
class Bar
{
public function __construct(
#[AutowireDecorated]
private $inner,
) {
}
// ...
#[AsDecorator(decorates: Foo::class, priority: 5)]
class Bar
{
public function __construct(
#[AutowireDecorated]
private $inner,
) {
}
// ...
}
#[AsDecorator(decorates: Foo::class, priority: 1)]
class Baz
{
public function __construct(
#[AutowireDecorated]
private $inner,
) {
}
// ...
#[AsDecorator(decorates: Foo::class, priority: 1)]
class Baz
{
public function __construct(
#[AutowireDecorated]
private $inner,
) {
}
// ...
}
.. code-block:: yaml
# config/services.yaml
Expand Down Expand Up @@ -619,24 +619,24 @@ Three different behaviors are available:

.. configuration-block::

.. code-block:: php-attributes
// ...
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
use Symfony\Component\DependencyInjection\ContainerInterface;
.. code-block:: php-attributes
#[AsDecorator(decorates: Mailer::class, onInvalid: ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]
class Bar
{
public function __construct(
#[AutowireDecorated] private $inner,
) {
}
// ...
use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
use Symfony\Component\DependencyInjection\ContainerInterface;
// ...
#[AsDecorator(decorates: Mailer::class, onInvalid: ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]
class Bar
{
public function __construct(
#[AutowireDecorated] private $inner,
) {
}
// ...
}
.. code-block:: yaml
# config/services.yaml
Expand Down

0 comments on commit 30c74fd

Please sign in to comment.