Merge remote-tracking branch 'upstream/7.3' into 7.3

* upstream/7.3: Minor tweaks Add `role_fetcher` option to LDAP security configuration Minor tweaks Update http client timeout option docs [FrameworkBundle] Allow to pass signals to `StopWorkerOnSignalsListener` in XML config and as plain strings

Author: OskarStark

messenger.rst

@@ -848,7 +848,56 @@ message before terminating.
 
 However, you might prefer to use different POSIX signals for graceful shutdown.
 You can override default ones by setting the ``framework.messenger.stop_worker_on_signals``
-configuration option.
+configuration option:
+
+.. configuration-block::
+
+ .. code-block:: yaml
+
+ # config/packages/messenger.yaml
+ framework:
+ messenger:
+ stop_worker_on_signals:
+ - SIGTERM
+ - SIGINT
+ - SIGUSR1
+
+ .. code-block:: xml
+
+ <!-- config/packages/messenger.xml -->
+ <?xml version="1.0" encoding="UTF-8" ?>
+ <container xmlns="http://symfony.com/schema/dic/services"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:framework="http://symfony.com/schema/dic/symfony"
+ xsi:schemaLocation="http://symfony.com/schema/dic/services
+ https://symfony.com/schema/dic/services/services-1.0.xsd
+ http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+ <framework:config>
+ <framework:messenger>
+ <!-- ... -->
+ <framework:stop-worker-on-signal>SIGTERM</framework:stop-worker-on-signal>
+ <framework:stop-worker-on-signal>SIGINT</framework:stop-worker-on-signal>
+ <framework:stop-worker-on-signal>SIGUSR1</framework:stop-worker-on-signal>
+ </framework:messenger>
+ </framework:config>
+ </container>
+
+ .. code-block:: php
+
+ // config/packages/messenger.php
+ use Symfony\Config\FrameworkConfig;
+
+ return static function (FrameworkConfig $framework): void {
+ $framework->messenger()
+ ->stopWorkerOnSignals(['SIGTERM', 'SIGINT', 'SIGUSR1']);
+ };
+
+.. versionadded:: 7.3
+
+ Support for signals plain names in configuration was introduced in Symfony 7.3.
+ Previously, you had to use the numeric values of signals as defined by the
+ ``pcntl`` extension's `predefined constants`_.
 
 In some cases the ``SIGTERM`` signal is sent by Supervisor itself (e.g. stopping
 a Docker container having Supervisor as its entrypoint). In these cases you
@@ -3587,3 +3636,4 @@ Learn more
 .. _`high connection churn`: https://www.rabbitmq.com/connections.html#high-connection-churn
 .. _`article about CQRS`: https://martinfowler.com/bliki/CQRS.html
 .. _`SSL context options`: https://php.net/context.ssl
+.. _`predefined constants`: https://www.php.net/pcntl.constants

reference/configuration/framework.rst

@@ -1261,7 +1261,7 @@ timeout
 
 **type**: ``float`` **default**: depends on your PHP config
 
-Time, in seconds, to wait for a response. If the response takes longer, a
+Time, in seconds, to wait for network activity. If the connection is idle for longer, a
 :class:`Symfony\\Component\\HttpClient\\Exception\\TransportException` is thrown.
 Its default value is the same as the value of PHP's `default_socket_timeout`_
 config option.

security/ldap.rst

@@ -256,6 +256,24 @@ This is the default role you wish to give to a user fetched from the LDAP
 server. If you do not configure this key, your users won't have any roles,
 and will not be considered as authenticated fully.
 
+role_fetcher
+............
+
+**Type**: ``string`` **Default**: ``null``
+
+When your LDAP service provides user roles, this option allows you to define
+the service that retrieves these roles. The role fetcher service must implement
+the ``Symfony\Component\Ldap\Security\RoleFetcherInterface``. When this option
+is set, the ``default_roles`` option is ignored.
+
+Symfony provides ``Symfony\Component\Ldap\Security\MemberOfRoles``, a concrete
+implementation of the interface that fetches roles from the ``ismemberof``
+attribute.
+
+.. versionadded:: 7.3
+
+ The ``role_fetcher`` configuration option was introduced in Symfony 7.3.
+
 uid_key
 .......